mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-09-20 11:19:16 +00:00
Reformat various code.
This commit is contained in:
@@ -70,7 +70,6 @@ class AccountController extends Controller
|
|||||||
* @param AutocompleteRequest $request
|
* @param AutocompleteRequest $request
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws FireflyException
|
|
||||||
* @throws JsonException
|
* @throws JsonException
|
||||||
*/
|
*/
|
||||||
public function accounts(AutocompleteRequest $request): JsonResponse
|
public function accounts(AutocompleteRequest $request): JsonResponse
|
||||||
|
@@ -77,6 +77,9 @@ class AccountController extends Controller
|
|||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \JsonException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function overview(DateRequest $request): JsonResponse
|
public function overview(DateRequest $request): JsonResponse
|
||||||
{
|
{
|
||||||
|
@@ -74,6 +74,8 @@ abstract class Controller extends BaseController
|
|||||||
* Method to grab all parameters from the URI.
|
* Method to grab all parameters from the URI.
|
||||||
*
|
*
|
||||||
* @return ParameterBag
|
* @return ParameterBag
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
private function getParameters(): ParameterBag
|
private function getParameters(): ParameterBag
|
||||||
{
|
{
|
||||||
|
@@ -209,8 +209,6 @@ class ListController extends Controller
|
|||||||
*
|
*
|
||||||
* @param Request $request
|
* @param Request $request
|
||||||
*
|
*
|
||||||
* @param Budget $budget
|
|
||||||
*
|
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
* @codeCoverageIgnore
|
* @codeCoverageIgnore
|
||||||
|
@@ -72,6 +72,7 @@ class ShowController extends Controller
|
|||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \JsonException
|
||||||
* @codeCoverageIgnore
|
* @codeCoverageIgnore
|
||||||
*/
|
*/
|
||||||
public function index(): JsonResponse
|
public function index(): JsonResponse
|
||||||
@@ -106,6 +107,8 @@ class ShowController extends Controller
|
|||||||
* @param TransactionCurrency $currency
|
* @param TransactionCurrency $currency
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
|
* @throws FireflyException
|
||||||
|
* @throws \JsonException
|
||||||
* @codeCoverageIgnore
|
* @codeCoverageIgnore
|
||||||
*/
|
*/
|
||||||
public function show(TransactionCurrency $currency): JsonResponse
|
public function show(TransactionCurrency $currency): JsonResponse
|
||||||
@@ -130,6 +133,8 @@ class ShowController extends Controller
|
|||||||
* Show a currency.
|
* Show a currency.
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
|
* @throws FireflyException
|
||||||
|
* @throws \JsonException
|
||||||
* @codeCoverageIgnore
|
* @codeCoverageIgnore
|
||||||
*/
|
*/
|
||||||
public function showDefault(): JsonResponse
|
public function showDefault(): JsonResponse
|
||||||
|
@@ -74,6 +74,7 @@ class StoreController extends Controller
|
|||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \JsonException
|
||||||
*/
|
*/
|
||||||
public function store(StoreRequest $request): JsonResponse
|
public function store(StoreRequest $request): JsonResponse
|
||||||
{
|
{
|
||||||
|
@@ -75,6 +75,8 @@ class UpdateController extends Controller
|
|||||||
* @param TransactionCurrency $currency
|
* @param TransactionCurrency $currency
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
|
* @throws FireflyException
|
||||||
|
* @throws JsonException
|
||||||
* @codeCoverageIgnore
|
* @codeCoverageIgnore
|
||||||
*/
|
*/
|
||||||
public function disable(TransactionCurrency $currency): JsonResponse
|
public function disable(TransactionCurrency $currency): JsonResponse
|
||||||
@@ -108,6 +110,8 @@ class UpdateController extends Controller
|
|||||||
* @param TransactionCurrency $currency
|
* @param TransactionCurrency $currency
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
|
* @throws FireflyException
|
||||||
|
* @throws JsonException
|
||||||
* @codeCoverageIgnore
|
* @codeCoverageIgnore
|
||||||
*/
|
*/
|
||||||
public function enable(TransactionCurrency $currency): JsonResponse
|
public function enable(TransactionCurrency $currency): JsonResponse
|
||||||
|
@@ -113,7 +113,7 @@ class BasicController extends Controller
|
|||||||
// give new keys
|
// give new keys
|
||||||
$return = [];
|
$return = [];
|
||||||
foreach ($total as $entry) {
|
foreach ($total as $entry) {
|
||||||
if (null === $code || (null !== $code && $code === $entry['currency_code'])) {
|
if (null === $code || ($code === $entry['currency_code'])) {
|
||||||
$return[$entry['key']] = $entry;
|
$return[$entry['key']] = $entry;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -94,6 +94,8 @@ class ConfigurationController extends Controller
|
|||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
private function getDynamicConfiguration(): array
|
private function getDynamicConfiguration(): array
|
||||||
{
|
{
|
||||||
|
@@ -57,7 +57,6 @@ class CorrectOpeningBalanceCurrencies extends Command
|
|||||||
* Execute the console command.
|
* Execute the console command.
|
||||||
*
|
*
|
||||||
* @return int
|
* @return int
|
||||||
* @throws JsonException
|
|
||||||
*/
|
*/
|
||||||
public function handle(): int
|
public function handle(): int
|
||||||
{
|
{
|
||||||
@@ -136,6 +135,8 @@ class CorrectOpeningBalanceCurrencies extends Command
|
|||||||
* @param Account $account
|
* @param Account $account
|
||||||
*
|
*
|
||||||
* @return TransactionCurrency
|
* @return TransactionCurrency
|
||||||
|
* @throws JsonException
|
||||||
|
* @throws \FireflyIII\Exceptions\FireflyException
|
||||||
*/
|
*/
|
||||||
private function getCurrency(Account $account): TransactionCurrency
|
private function getCurrency(Account $account): TransactionCurrency
|
||||||
{
|
{
|
||||||
|
@@ -109,6 +109,8 @@ class DecryptDatabase extends Command
|
|||||||
* @param string $table
|
* @param string $table
|
||||||
*
|
*
|
||||||
* @return bool
|
* @return bool
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
private function isDecrypted(string $table): bool
|
private function isDecrypted(string $table): bool
|
||||||
{
|
{
|
||||||
|
@@ -166,7 +166,7 @@ class Cron extends Command
|
|||||||
/**
|
/**
|
||||||
* @param bool $force
|
* @param bool $force
|
||||||
* @param Carbon|null $date
|
* @param Carbon|null $date
|
||||||
*
|
* @throws FireflyException
|
||||||
*/
|
*/
|
||||||
private function billWarningCronJob(bool $force, ?Carbon $date): void
|
private function billWarningCronJob(bool $force, ?Carbon $date): void
|
||||||
{
|
{
|
||||||
|
@@ -109,6 +109,8 @@ class AccountCurrencies extends Command
|
|||||||
/**
|
/**
|
||||||
* @return bool
|
* @return bool
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
private function isExecuted(): bool
|
private function isExecuted(): bool
|
||||||
{
|
{
|
||||||
|
@@ -72,6 +72,8 @@ class AppendBudgetLimitPeriods extends Command
|
|||||||
/**
|
/**
|
||||||
* @return bool
|
* @return bool
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
private function isExecuted(): bool
|
private function isExecuted(): bool
|
||||||
{
|
{
|
||||||
|
@@ -86,6 +86,8 @@ class BackToJournals extends Command
|
|||||||
/**
|
/**
|
||||||
* @return bool
|
* @return bool
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
private function isMigrated(): bool
|
private function isMigrated(): bool
|
||||||
{
|
{
|
||||||
@@ -97,6 +99,8 @@ class BackToJournals extends Command
|
|||||||
/**
|
/**
|
||||||
* @return bool
|
* @return bool
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
private function isExecuted(): bool
|
private function isExecuted(): bool
|
||||||
{
|
{
|
||||||
|
@@ -99,6 +99,8 @@ class BudgetLimitCurrency extends Command
|
|||||||
/**
|
/**
|
||||||
* @return bool
|
* @return bool
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
private function isExecuted(): bool
|
private function isExecuted(): bool
|
||||||
{
|
{
|
||||||
|
@@ -96,6 +96,8 @@ class CCLiabilities extends Command
|
|||||||
/**
|
/**
|
||||||
* @return bool
|
* @return bool
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
private function isExecuted(): bool
|
private function isExecuted(): bool
|
||||||
{
|
{
|
||||||
|
@@ -77,6 +77,8 @@ class CreateGroupMemberships extends Command
|
|||||||
/**
|
/**
|
||||||
* @return bool
|
* @return bool
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
private function isExecuted(): bool
|
private function isExecuted(): bool
|
||||||
{
|
{
|
||||||
|
@@ -108,6 +108,8 @@ class MigrateAttachments extends Command
|
|||||||
/**
|
/**
|
||||||
* @return bool
|
* @return bool
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
private function isExecuted(): bool
|
private function isExecuted(): bool
|
||||||
{
|
{
|
||||||
|
@@ -106,6 +106,8 @@ class MigrateJournalNotes extends Command
|
|||||||
/**
|
/**
|
||||||
* @return bool
|
* @return bool
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
private function isExecuted(): bool
|
private function isExecuted(): bool
|
||||||
{
|
{
|
||||||
|
@@ -84,6 +84,8 @@ class MigrateRecurrenceMeta extends Command
|
|||||||
/**
|
/**
|
||||||
* @return bool
|
* @return bool
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
private function isExecuted(): bool
|
private function isExecuted(): bool
|
||||||
{
|
{
|
||||||
|
@@ -77,6 +77,8 @@ class MigrateRecurrenceType extends Command
|
|||||||
/**
|
/**
|
||||||
* @return bool
|
* @return bool
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
private function isExecuted(): bool
|
private function isExecuted(): bool
|
||||||
{
|
{
|
||||||
|
@@ -75,6 +75,8 @@ class MigrateTagLocations extends Command
|
|||||||
/**
|
/**
|
||||||
* @return bool
|
* @return bool
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
private function isExecuted(): bool
|
private function isExecuted(): bool
|
||||||
{
|
{
|
||||||
|
@@ -129,6 +129,8 @@ class MigrateToGroups extends Command
|
|||||||
/**
|
/**
|
||||||
* @return bool
|
* @return bool
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
private function isMigrated(): bool
|
private function isMigrated(): bool
|
||||||
{
|
{
|
||||||
|
@@ -120,6 +120,8 @@ class MigrateToRules extends Command
|
|||||||
/**
|
/**
|
||||||
* @return bool
|
* @return bool
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
private function isExecuted(): bool
|
private function isExecuted(): bool
|
||||||
{
|
{
|
||||||
|
@@ -115,6 +115,8 @@ class OtherCurrenciesCorrections extends Command
|
|||||||
/**
|
/**
|
||||||
* @return bool
|
* @return bool
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
private function isExecuted(): bool
|
private function isExecuted(): bool
|
||||||
{
|
{
|
||||||
|
@@ -99,6 +99,8 @@ class RenameAccountMeta extends Command
|
|||||||
/**
|
/**
|
||||||
* @return bool
|
* @return bool
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
private function isExecuted(): bool
|
private function isExecuted(): bool
|
||||||
{
|
{
|
||||||
|
@@ -123,6 +123,8 @@ class TransactionIdentifier extends Command
|
|||||||
/**
|
/**
|
||||||
* @return bool
|
* @return bool
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
private function isExecuted(): bool
|
private function isExecuted(): bool
|
||||||
{
|
{
|
||||||
|
@@ -68,6 +68,9 @@ class TransferCurrenciesCorrections extends Command
|
|||||||
* Execute the console command.
|
* Execute the console command.
|
||||||
*
|
*
|
||||||
* @return int
|
* @return int
|
||||||
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function handle(): int
|
public function handle(): int
|
||||||
{
|
{
|
||||||
@@ -134,6 +137,8 @@ class TransferCurrenciesCorrections extends Command
|
|||||||
/**
|
/**
|
||||||
* @return bool
|
* @return bool
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
private function isExecuted(): bool
|
private function isExecuted(): bool
|
||||||
{
|
{
|
||||||
|
@@ -81,6 +81,8 @@ class UpgradeLiabilities extends Command
|
|||||||
/**
|
/**
|
||||||
* @return bool
|
* @return bool
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
private function isExecuted(): bool
|
private function isExecuted(): bool
|
||||||
{
|
{
|
||||||
|
@@ -50,6 +50,7 @@ class VerifySecurityAlerts extends Command
|
|||||||
* Execute the console command.
|
* Execute the console command.
|
||||||
*
|
*
|
||||||
* @return int
|
* @return int
|
||||||
|
* @throws \League\Flysystem\FilesystemException
|
||||||
*/
|
*/
|
||||||
public function handle(): int
|
public function handle(): int
|
||||||
{
|
{
|
||||||
|
@@ -42,7 +42,6 @@ class Kernel extends ConsoleKernel
|
|||||||
{
|
{
|
||||||
$this->load(__DIR__ . '/Commands');
|
$this->load(__DIR__ . '/Commands');
|
||||||
|
|
||||||
/** @noinspection PhpIncludeInspection */
|
|
||||||
require base_path('routes/console.php');
|
require base_path('routes/console.php');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -74,6 +74,7 @@ class AccountFactory
|
|||||||
*
|
*
|
||||||
* @return Account
|
* @return Account
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws JsonException
|
||||||
*/
|
*/
|
||||||
public function findOrCreate(string $accountName, string $accountType): Account
|
public function findOrCreate(string $accountName, string $accountType): Account
|
||||||
{
|
{
|
||||||
@@ -182,6 +183,7 @@ class AccountFactory
|
|||||||
* @param array $data
|
* @param array $data
|
||||||
*
|
*
|
||||||
* @return Account
|
* @return Account
|
||||||
|
* @throws FireflyException
|
||||||
* @throws JsonException
|
* @throws JsonException
|
||||||
*/
|
*/
|
||||||
private function createAccount(AccountType $type, array $data): Account
|
private function createAccount(AccountType $type, array $data): Account
|
||||||
@@ -361,7 +363,6 @@ class AccountFactory
|
|||||||
* @param array $data
|
* @param array $data
|
||||||
*
|
*
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
* @throws JsonException
|
|
||||||
*/
|
*/
|
||||||
private function storeOrder(Account $account, array $data): void
|
private function storeOrder(Account $account, array $data): void
|
||||||
{
|
{
|
||||||
|
@@ -58,12 +58,10 @@ class AccountMetaFactory
|
|||||||
}
|
}
|
||||||
|
|
||||||
// if $data has field and $entry is not null, update $entry:
|
// if $data has field and $entry is not null, update $entry:
|
||||||
if (null !== $entry) {
|
|
||||||
$entry->data = $value;
|
$entry->data = $value;
|
||||||
$entry->save();
|
$entry->save();
|
||||||
Log::debug(sprintf('Updated meta-field "%s":"%s" for #%d ("%s") ', $field, $value, $account->id, $account->name));
|
Log::debug(sprintf('Updated meta-field "%s":"%s" for #%d ("%s") ', $field, $value, $account->id, $account->name));
|
||||||
}
|
}
|
||||||
}
|
|
||||||
if ('' === $value && null !== $entry) {
|
if ('' === $value && null !== $entry) {
|
||||||
try {
|
try {
|
||||||
$entry->delete();
|
$entry->delete();
|
||||||
|
@@ -46,6 +46,7 @@ class BillFactory
|
|||||||
*
|
*
|
||||||
* @return Bill|null
|
* @return Bill|null
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \JsonException
|
||||||
*/
|
*/
|
||||||
public function create(array $data): ?Bill
|
public function create(array $data): ?Bill
|
||||||
{
|
{
|
||||||
|
@@ -57,6 +57,7 @@ class TransactionGroupFactory
|
|||||||
* @return TransactionGroup
|
* @return TransactionGroup
|
||||||
* @throws DuplicateTransactionException
|
* @throws DuplicateTransactionException
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \JsonException
|
||||||
*/
|
*/
|
||||||
public function create(array $data): TransactionGroup
|
public function create(array $data): TransactionGroup
|
||||||
{
|
{
|
||||||
|
@@ -417,6 +417,8 @@ class TransactionJournalFactory
|
|||||||
* @param Account $account
|
* @param Account $account
|
||||||
*
|
*
|
||||||
* @return TransactionCurrency
|
* @return TransactionCurrency
|
||||||
|
* @throws FireflyException
|
||||||
|
* @throws JsonException
|
||||||
*/
|
*/
|
||||||
private function getCurrency(?TransactionCurrency $currency, Account $account): TransactionCurrency
|
private function getCurrency(?TransactionCurrency $currency, Account $account): TransactionCurrency
|
||||||
{
|
{
|
||||||
|
@@ -49,6 +49,8 @@ class MonthReportGenerator implements ReportGeneratorInterface
|
|||||||
* Generates the report.
|
* Generates the report.
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
|
* @throws FireflyException
|
||||||
|
* @throws JsonException
|
||||||
* @codeCoverageIgnore
|
* @codeCoverageIgnore
|
||||||
*/
|
*/
|
||||||
public function generate(): string
|
public function generate(): string
|
||||||
|
@@ -102,6 +102,8 @@ class StandardMessageGenerator implements MessageGeneratorInterface
|
|||||||
/**
|
/**
|
||||||
* @param Webhook $webhook
|
* @param Webhook $webhook
|
||||||
* @param Model $model
|
* @param Model $model
|
||||||
|
* @throws FireflyException
|
||||||
|
* @throws \JsonException
|
||||||
*/
|
*/
|
||||||
private function generateMessage(Webhook $webhook, Model $model): void
|
private function generateMessage(Webhook $webhook, Model $model): void
|
||||||
{
|
{
|
||||||
@@ -196,9 +198,9 @@ class StandardMessageGenerator implements MessageGeneratorInterface
|
|||||||
* @param Webhook $webhook
|
* @param Webhook $webhook
|
||||||
* @param array $message
|
* @param array $message
|
||||||
*
|
*
|
||||||
* @return WebhookMessage
|
* @return void
|
||||||
*/
|
*/
|
||||||
private function storeMessage(Webhook $webhook, array $message): WebhookMessage
|
private function storeMessage(Webhook $webhook, array $message): void
|
||||||
{
|
{
|
||||||
$webhookMessage = new WebhookMessage;
|
$webhookMessage = new WebhookMessage;
|
||||||
$webhookMessage->webhook()->associate($webhook);
|
$webhookMessage->webhook()->associate($webhook);
|
||||||
@@ -209,7 +211,6 @@ class StandardMessageGenerator implements MessageGeneratorInterface
|
|||||||
$webhookMessage->save();
|
$webhookMessage->save();
|
||||||
Log::debug(sprintf('Stored new webhook message #%d', $webhookMessage->id));
|
Log::debug(sprintf('Stored new webhook message #%d', $webhookMessage->id));
|
||||||
|
|
||||||
return $webhookMessage;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -43,7 +43,6 @@ class AutomationHandler
|
|||||||
* @param RequestedReportOnJournals $event
|
* @param RequestedReportOnJournals $event
|
||||||
*
|
*
|
||||||
* @return bool
|
* @return bool
|
||||||
* @throws FireflyException
|
|
||||||
*/
|
*/
|
||||||
public function reportJournals(RequestedReportOnJournals $event): bool
|
public function reportJournals(RequestedReportOnJournals $event): bool
|
||||||
{
|
{
|
||||||
|
@@ -37,6 +37,7 @@ class BillEventHandler
|
|||||||
/**
|
/**
|
||||||
* @param WarnUserAboutBill $event
|
* @param WarnUserAboutBill $event
|
||||||
* @return void
|
* @return void
|
||||||
|
* @throws \FireflyIII\Exceptions\FireflyException
|
||||||
*/
|
*/
|
||||||
public function warnAboutBill(WarnUserAboutBill $event): void
|
public function warnAboutBill(WarnUserAboutBill $event): void
|
||||||
{
|
{
|
||||||
|
@@ -332,11 +332,11 @@ class UserEventHandler
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @param ActuallyLoggedIn $event
|
* @param ActuallyLoggedIn $event
|
||||||
|
* @throws FireflyException
|
||||||
*/
|
*/
|
||||||
public function storeUserIPAddress(ActuallyLoggedIn $event): void
|
public function storeUserIPAddress(ActuallyLoggedIn $event): void
|
||||||
{
|
{
|
||||||
Log::debug('Now in storeUserIPAddress');
|
Log::debug('Now in storeUserIPAddress');
|
||||||
/** @var User $user */
|
|
||||||
$user = $event->user;
|
$user = $event->user;
|
||||||
/** @var array $preference */
|
/** @var array $preference */
|
||||||
try {
|
try {
|
||||||
|
@@ -44,6 +44,8 @@ class VersionCheckEventHandler
|
|||||||
* @param RequestedVersionCheckStatus $event
|
* @param RequestedVersionCheckStatus $event
|
||||||
*
|
*
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function checkForUpdates(RequestedVersionCheckStatus $event): void
|
public function checkForUpdates(RequestedVersionCheckStatus $event): void
|
||||||
{
|
{
|
||||||
@@ -90,6 +92,8 @@ class VersionCheckEventHandler
|
|||||||
* @param RequestedVersionCheckStatus $event
|
* @param RequestedVersionCheckStatus $event
|
||||||
*
|
*
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
protected function warnToCheckForUpdates(RequestedVersionCheckStatus $event): void
|
protected function warnToCheckForUpdates(RequestedVersionCheckStatus $event): void
|
||||||
{
|
{
|
||||||
|
@@ -46,6 +46,9 @@ class FiscalHelper implements FiscalHelperInterface
|
|||||||
* @param Carbon $date
|
* @param Carbon $date
|
||||||
*
|
*
|
||||||
* @return Carbon date object
|
* @return Carbon date object
|
||||||
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function endOfFiscalYear(Carbon $date): Carbon
|
public function endOfFiscalYear(Carbon $date): Carbon
|
||||||
{
|
{
|
||||||
@@ -69,6 +72,8 @@ class FiscalHelper implements FiscalHelperInterface
|
|||||||
*
|
*
|
||||||
* @return Carbon date object
|
* @return Carbon date object
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function startOfFiscalYear(Carbon $date): Carbon
|
public function startOfFiscalYear(Carbon $date): Carbon
|
||||||
{
|
{
|
||||||
|
@@ -63,6 +63,7 @@ class NetWorth implements NetWorthInterface
|
|||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
* @throws JsonException
|
* @throws JsonException
|
||||||
|
* @throws \FireflyIII\Exceptions\FireflyException
|
||||||
*/
|
*/
|
||||||
public function getNetWorthByCurrency(Collection $accounts, Carbon $date): array
|
public function getNetWorthByCurrency(Collection $accounts, Carbon $date): array
|
||||||
{
|
{
|
||||||
|
@@ -40,6 +40,8 @@ trait UpdateTrait
|
|||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function getLatestRelease(): array
|
public function getLatestRelease(): array
|
||||||
{
|
{
|
||||||
|
@@ -137,6 +137,8 @@ class CreateController extends Controller
|
|||||||
*
|
*
|
||||||
* @return RedirectResponse|Redirector
|
* @return RedirectResponse|Redirector
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function store(AccountFormRequest $request)
|
public function store(AccountFormRequest $request)
|
||||||
{
|
{
|
||||||
|
@@ -74,6 +74,9 @@ class IndexController extends Controller
|
|||||||
*
|
*
|
||||||
* @return Factory|View
|
* @return Factory|View
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \JsonException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function inactive(Request $request, string $objectType)
|
public function inactive(Request $request, string $objectType)
|
||||||
{
|
{
|
||||||
@@ -128,7 +131,10 @@ class IndexController extends Controller
|
|||||||
* @param string $objectType
|
* @param string $objectType
|
||||||
*
|
*
|
||||||
* @return Factory|View
|
* @return Factory|View
|
||||||
* @throws Exception
|
* @throws FireflyException
|
||||||
|
* @throws \JsonException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function index(Request $request, string $objectType)
|
public function index(Request $request, string $objectType)
|
||||||
{
|
{
|
||||||
|
@@ -86,7 +86,10 @@ class ReconcileController extends Controller
|
|||||||
* @param Carbon|null $end
|
* @param Carbon|null $end
|
||||||
*
|
*
|
||||||
* @return Factory|RedirectResponse|Redirector|View
|
* @return Factory|RedirectResponse|Redirector|View
|
||||||
* @throws Exception
|
* @throws FireflyException
|
||||||
|
* @throws \JsonException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function reconcile(Account $account, Carbon $start = null, Carbon $end = null)
|
public function reconcile(Account $account, Carbon $start = null, Carbon $end = null)
|
||||||
{
|
{
|
||||||
|
@@ -83,8 +83,10 @@ class ShowController extends Controller
|
|||||||
* @param Carbon|null $end
|
* @param Carbon|null $end
|
||||||
*
|
*
|
||||||
* @return RedirectResponse|Redirector|Factory|View
|
* @return RedirectResponse|Redirector|Factory|View
|
||||||
* @throws Exception
|
* @throws \FireflyIII\Exceptions\FireflyException
|
||||||
*
|
* @throws \JsonException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function show(Request $request, Account $account, Carbon $start = null, Carbon $end = null)
|
public function show(Request $request, Account $account, Carbon $start = null, Carbon $end = null)
|
||||||
{
|
{
|
||||||
@@ -164,8 +166,10 @@ class ShowController extends Controller
|
|||||||
* @param Account $account
|
* @param Account $account
|
||||||
*
|
*
|
||||||
* @return RedirectResponse|Redirector|Factory|View
|
* @return RedirectResponse|Redirector|Factory|View
|
||||||
* @throws Exception
|
* @throws \FireflyIII\Exceptions\FireflyException
|
||||||
*
|
* @throws \JsonException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function showAll(Request $request, Account $account)
|
public function showAll(Request $request, Account $account)
|
||||||
{
|
{
|
||||||
|
@@ -61,6 +61,8 @@ class ConfigurationController extends Controller
|
|||||||
*
|
*
|
||||||
* @return Factory|View
|
* @return Factory|View
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function index()
|
public function index()
|
||||||
{
|
{
|
||||||
|
@@ -55,6 +55,8 @@ class HomeController extends Controller
|
|||||||
*
|
*
|
||||||
* @return Factory|View
|
* @return Factory|View
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function index()
|
public function index()
|
||||||
{
|
{
|
||||||
|
@@ -61,6 +61,8 @@ class UpdateController extends Controller
|
|||||||
*
|
*
|
||||||
* @return Factory|View
|
* @return Factory|View
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function index()
|
public function index()
|
||||||
{
|
{
|
||||||
|
@@ -110,6 +110,8 @@ class ForgotPasswordController extends Controller
|
|||||||
*
|
*
|
||||||
* @return Factory|View
|
* @return Factory|View
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function showLinkRequestForm()
|
public function showLinkRequestForm()
|
||||||
{
|
{
|
||||||
|
@@ -203,6 +203,8 @@ class LoginController extends Controller
|
|||||||
*
|
*
|
||||||
* @return Factory|Application|View|Redirector|RedirectResponse
|
* @return Factory|Application|View|Redirector|RedirectResponse
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function showLoginForm(Request $request)
|
public function showLoginForm(Request $request)
|
||||||
{
|
{
|
||||||
|
@@ -109,6 +109,7 @@ class RegisterController extends Controller
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @return bool
|
* @return bool
|
||||||
|
* @throws FireflyException
|
||||||
*/
|
*/
|
||||||
protected function allowedToRegister(): bool
|
protected function allowedToRegister(): bool
|
||||||
{
|
{
|
||||||
@@ -136,7 +137,9 @@ class RegisterController extends Controller
|
|||||||
* @param Request $request
|
* @param Request $request
|
||||||
*
|
*
|
||||||
* @return Factory|View
|
* @return Factory|View
|
||||||
|
* @throws ContainerExceptionInterface
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function showRegistrationForm(Request $request)
|
public function showRegistrationForm(Request $request)
|
||||||
{
|
{
|
||||||
|
@@ -123,6 +123,8 @@ class ResetPasswordController extends Controller
|
|||||||
*
|
*
|
||||||
* @return Factory|View
|
* @return Factory|View
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function showResetForm(Request $request, $token = null)
|
public function showResetForm(Request $request, $token = null)
|
||||||
{
|
{
|
||||||
|
@@ -146,6 +146,8 @@ class IndexController extends Controller
|
|||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
private function getSums(array $bills): array
|
private function getSums(array $bills): array
|
||||||
{
|
{
|
||||||
|
@@ -123,7 +123,9 @@ class ShowController extends Controller
|
|||||||
* @param Bill $bill
|
* @param Bill $bill
|
||||||
*
|
*
|
||||||
* @return Factory|View
|
* @return Factory|View
|
||||||
* @throws FireflyException
|
* @throws \FireflyIII\Exceptions\FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function show(Request $request, Bill $bill)
|
public function show(Request $request, Bill $bill)
|
||||||
{
|
{
|
||||||
|
@@ -171,6 +171,8 @@ class AvailableBudgetController extends Controller
|
|||||||
* @param Request $request
|
* @param Request $request
|
||||||
*
|
*
|
||||||
* @return RedirectResponse|Redirector
|
* @return RedirectResponse|Redirector
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function store(Request $request)
|
public function store(Request $request)
|
||||||
{
|
{
|
||||||
|
@@ -92,6 +92,9 @@ class IndexController extends Controller
|
|||||||
*
|
*
|
||||||
* @return Factory|View
|
* @return Factory|View
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \JsonException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function index(Request $request, Carbon $start = null, Carbon $end = null)
|
public function index(Request $request, Carbon $start = null, Carbon $end = null)
|
||||||
{
|
{
|
||||||
|
@@ -79,6 +79,9 @@ class ShowController extends Controller
|
|||||||
*
|
*
|
||||||
* @return Factory|View
|
* @return Factory|View
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \JsonException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function noBudget(Request $request, Carbon $start = null, Carbon $end = null)
|
public function noBudget(Request $request, Carbon $start = null, Carbon $end = null)
|
||||||
{
|
{
|
||||||
@@ -115,6 +118,8 @@ class ShowController extends Controller
|
|||||||
*
|
*
|
||||||
* @return Factory|View
|
* @return Factory|View
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function noBudgetAll(Request $request)
|
public function noBudgetAll(Request $request)
|
||||||
{
|
{
|
||||||
@@ -144,6 +149,9 @@ class ShowController extends Controller
|
|||||||
*
|
*
|
||||||
* @return Factory|View
|
* @return Factory|View
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \JsonException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function show(Request $request, Budget $budget)
|
public function show(Request $request, Budget $budget)
|
||||||
{
|
{
|
||||||
@@ -179,6 +187,9 @@ class ShowController extends Controller
|
|||||||
*
|
*
|
||||||
* @return Factory|View
|
* @return Factory|View
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \JsonException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function showByBudgetLimit(Request $request, Budget $budget, BudgetLimit $budgetLimit)
|
public function showByBudgetLimit(Request $request, Budget $budget, BudgetLimit $budgetLimit)
|
||||||
{
|
{
|
||||||
|
@@ -68,6 +68,8 @@ class IndexController extends Controller
|
|||||||
*
|
*
|
||||||
* @return Factory|View
|
* @return Factory|View
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function index(Request $request)
|
public function index(Request $request)
|
||||||
{
|
{
|
||||||
|
@@ -76,6 +76,9 @@ class NoCategoryController extends Controller
|
|||||||
*
|
*
|
||||||
* @return Factory|View
|
* @return Factory|View
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \JsonException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function show(Request $request, Carbon $start = null, Carbon $end = null)
|
public function show(Request $request, Carbon $start = null, Carbon $end = null)
|
||||||
{
|
{
|
||||||
@@ -114,6 +117,8 @@ class NoCategoryController extends Controller
|
|||||||
*
|
*
|
||||||
* @return Factory|View
|
* @return Factory|View
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function showAll(Request $request)
|
public function showAll(Request $request)
|
||||||
{
|
{
|
||||||
|
@@ -78,6 +78,9 @@ class ShowController extends Controller
|
|||||||
*
|
*
|
||||||
* @return Factory|View
|
* @return Factory|View
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \JsonException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function show(Request $request, Category $category, Carbon $start = null, Carbon $end = null)
|
public function show(Request $request, Category $category, Carbon $start = null, Carbon $end = null)
|
||||||
{
|
{
|
||||||
@@ -118,6 +121,8 @@ class ShowController extends Controller
|
|||||||
*
|
*
|
||||||
* @return Factory|View
|
* @return Factory|View
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function showAll(Request $request, Category $category)
|
public function showAll(Request $request, Category $category)
|
||||||
{
|
{
|
||||||
|
@@ -175,6 +175,7 @@ class AccountController extends Controller
|
|||||||
* @param Account $account
|
* @param Account $account
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
|
* @throws JsonException
|
||||||
*/
|
*/
|
||||||
public function expenseBudgetAll(AccountRepositoryInterface $repository, Account $account): JsonResponse
|
public function expenseBudgetAll(AccountRepositoryInterface $repository, Account $account): JsonResponse
|
||||||
{
|
{
|
||||||
@@ -192,7 +193,6 @@ class AccountController extends Controller
|
|||||||
* @param Carbon $end
|
* @param Carbon $end
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws JsonException
|
|
||||||
*/
|
*/
|
||||||
public function expenseBudget(Account $account, Carbon $start, Carbon $end): JsonResponse
|
public function expenseBudget(Account $account, Carbon $start, Carbon $end): JsonResponse
|
||||||
{
|
{
|
||||||
@@ -250,6 +250,7 @@ class AccountController extends Controller
|
|||||||
* @param Account $account
|
* @param Account $account
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
|
* @throws JsonException
|
||||||
*/
|
*/
|
||||||
public function expenseCategoryAll(AccountRepositoryInterface $repository, Account $account): JsonResponse
|
public function expenseCategoryAll(AccountRepositoryInterface $repository, Account $account): JsonResponse
|
||||||
{
|
{
|
||||||
@@ -267,7 +268,6 @@ class AccountController extends Controller
|
|||||||
* @param Carbon $end
|
* @param Carbon $end
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws JsonException
|
|
||||||
*/
|
*/
|
||||||
public function expenseCategory(Account $account, Carbon $start, Carbon $end): JsonResponse
|
public function expenseCategory(Account $account, Carbon $start, Carbon $end): JsonResponse
|
||||||
{
|
{
|
||||||
@@ -323,6 +323,9 @@ class AccountController extends Controller
|
|||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws JsonException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function frontpage(AccountRepositoryInterface $repository): JsonResponse
|
public function frontpage(AccountRepositoryInterface $repository): JsonResponse
|
||||||
{
|
{
|
||||||
@@ -348,6 +351,7 @@ class AccountController extends Controller
|
|||||||
* @param Account $account
|
* @param Account $account
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
|
* @throws JsonException
|
||||||
*/
|
*/
|
||||||
public function incomeCategoryAll(AccountRepositoryInterface $repository, Account $account): JsonResponse
|
public function incomeCategoryAll(AccountRepositoryInterface $repository, Account $account): JsonResponse
|
||||||
{
|
{
|
||||||
@@ -365,7 +369,6 @@ class AccountController extends Controller
|
|||||||
* @param Carbon $end
|
* @param Carbon $end
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws JsonException
|
|
||||||
*/
|
*/
|
||||||
public function incomeCategory(Account $account, Carbon $start, Carbon $end): JsonResponse
|
public function incomeCategory(Account $account, Carbon $start, Carbon $end): JsonResponse
|
||||||
{
|
{
|
||||||
@@ -517,11 +520,13 @@ class AccountController extends Controller
|
|||||||
*
|
*
|
||||||
* See reference nr. 55
|
* See reference nr. 55
|
||||||
*
|
*
|
||||||
* @param Carbon $start
|
|
||||||
* @param Carbon $end
|
|
||||||
* @param Collection $accounts
|
* @param Collection $accounts
|
||||||
*
|
*
|
||||||
|
* @param Carbon $start
|
||||||
|
* @param Carbon $end
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
|
* @throws FireflyException
|
||||||
|
* @throws JsonException
|
||||||
*/
|
*/
|
||||||
public function report(Collection $accounts, Carbon $start, Carbon $end): JsonResponse
|
public function report(Collection $accounts, Carbon $start, Carbon $end): JsonResponse
|
||||||
{
|
{
|
||||||
|
@@ -58,7 +58,6 @@ class BillController extends Controller
|
|||||||
* @param BillRepositoryInterface $repository
|
* @param BillRepositoryInterface $repository
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws JsonException
|
|
||||||
*/
|
*/
|
||||||
public function frontpage(BillRepositoryInterface $repository): JsonResponse
|
public function frontpage(BillRepositoryInterface $repository): JsonResponse
|
||||||
{
|
{
|
||||||
@@ -104,7 +103,7 @@ class BillController extends Controller
|
|||||||
* @param Bill $bill
|
* @param Bill $bill
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws JsonException
|
* @throws \FireflyIII\Exceptions\FireflyException
|
||||||
*/
|
*/
|
||||||
public function single(Bill $bill): JsonResponse
|
public function single(Bill $bill): JsonResponse
|
||||||
{
|
{
|
||||||
|
@@ -85,7 +85,6 @@ class BudgetController extends Controller
|
|||||||
* @param Budget $budget
|
* @param Budget $budget
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws JsonException
|
|
||||||
*/
|
*/
|
||||||
public function budget(Budget $budget): JsonResponse
|
public function budget(Budget $budget): JsonResponse
|
||||||
{
|
{
|
||||||
@@ -154,7 +153,6 @@ class BudgetController extends Controller
|
|||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
*
|
*
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
* @throws JsonException
|
|
||||||
*/
|
*/
|
||||||
public function budgetLimit(Budget $budget, BudgetLimit $budgetLimit): JsonResponse
|
public function budgetLimit(Budget $budget, BudgetLimit $budgetLimit): JsonResponse
|
||||||
{
|
{
|
||||||
@@ -205,7 +203,6 @@ class BudgetController extends Controller
|
|||||||
* @param BudgetLimit|null $budgetLimit
|
* @param BudgetLimit|null $budgetLimit
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws JsonException
|
|
||||||
*/
|
*/
|
||||||
public function expenseAsset(Budget $budget, ?BudgetLimit $budgetLimit = null): JsonResponse
|
public function expenseAsset(Budget $budget, ?BudgetLimit $budgetLimit = null): JsonResponse
|
||||||
{
|
{
|
||||||
@@ -274,7 +271,6 @@ class BudgetController extends Controller
|
|||||||
* @param BudgetLimit|null $budgetLimit
|
* @param BudgetLimit|null $budgetLimit
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws JsonException
|
|
||||||
*/
|
*/
|
||||||
public function expenseCategory(Budget $budget, ?BudgetLimit $budgetLimit = null): JsonResponse
|
public function expenseCategory(Budget $budget, ?BudgetLimit $budgetLimit = null): JsonResponse
|
||||||
{
|
{
|
||||||
@@ -339,7 +335,6 @@ class BudgetController extends Controller
|
|||||||
* @param BudgetLimit|null $budgetLimit
|
* @param BudgetLimit|null $budgetLimit
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws JsonException
|
|
||||||
*/
|
*/
|
||||||
public function expenseExpense(Budget $budget, ?BudgetLimit $budgetLimit = null): JsonResponse
|
public function expenseExpense(Budget $budget, ?BudgetLimit $budgetLimit = null): JsonResponse
|
||||||
{
|
{
|
||||||
@@ -403,7 +398,6 @@ class BudgetController extends Controller
|
|||||||
* Shows a budget list with spent/left/overspent.
|
* Shows a budget list with spent/left/overspent.
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws JsonException
|
|
||||||
*/
|
*/
|
||||||
public function frontpage(): JsonResponse
|
public function frontpage(): JsonResponse
|
||||||
{
|
{
|
||||||
@@ -441,7 +435,6 @@ class BudgetController extends Controller
|
|||||||
* @param Carbon $end
|
* @param Carbon $end
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws JsonException
|
|
||||||
*/
|
*/
|
||||||
public function period(Budget $budget, TransactionCurrency $currency, Collection $accounts, Carbon $start, Carbon $end): JsonResponse
|
public function period(Budget $budget, TransactionCurrency $currency, Collection $accounts, Carbon $start, Carbon $end): JsonResponse
|
||||||
{
|
{
|
||||||
@@ -517,7 +510,6 @@ class BudgetController extends Controller
|
|||||||
* @param Carbon $end
|
* @param Carbon $end
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws JsonException
|
|
||||||
*/
|
*/
|
||||||
public function periodNoBudget(TransactionCurrency $currency, Collection $accounts, Carbon $start, Carbon $end): JsonResponse
|
public function periodNoBudget(TransactionCurrency $currency, Collection $accounts, Carbon $start, Carbon $end): JsonResponse
|
||||||
{
|
{
|
||||||
|
@@ -71,7 +71,8 @@ class CategoryController extends Controller
|
|||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
* @throws JsonException
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function all(Category $category): JsonResponse
|
public function all(Category $category): JsonResponse
|
||||||
{
|
{
|
||||||
@@ -118,7 +119,6 @@ class CategoryController extends Controller
|
|||||||
* See reference nr. 60
|
* See reference nr. 60
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws JsonException
|
|
||||||
*/
|
*/
|
||||||
public function frontPage(): JsonResponse
|
public function frontPage(): JsonResponse
|
||||||
{
|
{
|
||||||
@@ -151,7 +151,6 @@ class CategoryController extends Controller
|
|||||||
* @param Carbon $end
|
* @param Carbon $end
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws JsonException
|
|
||||||
*/
|
*/
|
||||||
public function reportPeriod(Category $category, Collection $accounts, Carbon $start, Carbon $end): JsonResponse
|
public function reportPeriod(Category $category, Collection $accounts, Carbon $start, Carbon $end): JsonResponse
|
||||||
{
|
{
|
||||||
@@ -267,7 +266,6 @@ class CategoryController extends Controller
|
|||||||
* @param Carbon $end
|
* @param Carbon $end
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws JsonException
|
|
||||||
*/
|
*/
|
||||||
public function reportPeriodNoCategory(Collection $accounts, Carbon $start, Carbon $end): JsonResponse
|
public function reportPeriodNoCategory(Collection $accounts, Carbon $start, Carbon $end): JsonResponse
|
||||||
{
|
{
|
||||||
@@ -295,7 +293,8 @@ class CategoryController extends Controller
|
|||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
* @throws JsonException
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function specificPeriod(Category $category, Carbon $date): JsonResponse
|
public function specificPeriod(Category $category, Carbon $date): JsonResponse
|
||||||
{
|
{
|
||||||
|
@@ -64,7 +64,7 @@ class PiggyBankController extends Controller
|
|||||||
* @param PiggyBank $piggyBank
|
* @param PiggyBank $piggyBank
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws JsonException
|
* @throws \FireflyIII\Exceptions\FireflyException
|
||||||
*/
|
*/
|
||||||
public function history(PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank): JsonResponse
|
public function history(PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank): JsonResponse
|
||||||
{
|
{
|
||||||
|
@@ -69,7 +69,7 @@ class ReportController extends Controller
|
|||||||
* @param Carbon $end
|
* @param Carbon $end
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws JsonException
|
* @throws \FireflyIII\Exceptions\FireflyException
|
||||||
*/
|
*/
|
||||||
public function netWorth(Collection $accounts, Carbon $start, Carbon $end): JsonResponse
|
public function netWorth(Collection $accounts, Carbon $start, Carbon $end): JsonResponse
|
||||||
{
|
{
|
||||||
|
@@ -57,7 +57,6 @@ class TransactionController extends Controller
|
|||||||
* @param Carbon $end
|
* @param Carbon $end
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws JsonException
|
|
||||||
*/
|
*/
|
||||||
public function budgets(Carbon $start, Carbon $end)
|
public function budgets(Carbon $start, Carbon $end)
|
||||||
{
|
{
|
||||||
@@ -102,7 +101,6 @@ class TransactionController extends Controller
|
|||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
* @throws JsonException
|
|
||||||
*/
|
*/
|
||||||
public function categories(string $objectType, Carbon $start, Carbon $end)
|
public function categories(string $objectType, Carbon $start, Carbon $end)
|
||||||
{
|
{
|
||||||
@@ -161,7 +159,6 @@ class TransactionController extends Controller
|
|||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
* @throws JsonException
|
|
||||||
*/
|
*/
|
||||||
public function destinationAccounts(string $objectType, Carbon $start, Carbon $end)
|
public function destinationAccounts(string $objectType, Carbon $start, Carbon $end)
|
||||||
{
|
{
|
||||||
@@ -219,7 +216,6 @@ class TransactionController extends Controller
|
|||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
* @throws JsonException
|
|
||||||
*/
|
*/
|
||||||
public function sourceAccounts(string $objectType, Carbon $start, Carbon $end)
|
public function sourceAccounts(string $objectType, Carbon $start, Carbon $end)
|
||||||
{
|
{
|
||||||
|
@@ -209,8 +209,7 @@ class CurrencyController extends Controller
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @param Request $request
|
* @param Request $request
|
||||||
* @param TransactionCurrency $currency
|
* @return JsonResponse
|
||||||
*
|
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
*/
|
*/
|
||||||
public function disableCurrency(Request $request): JsonResponse
|
public function disableCurrency(Request $request): JsonResponse
|
||||||
@@ -312,8 +311,7 @@ class CurrencyController extends Controller
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param TransactionCurrency $currency
|
* @param Request $request
|
||||||
*
|
|
||||||
* @return RedirectResponse|Redirector
|
* @return RedirectResponse|Redirector
|
||||||
*/
|
*/
|
||||||
public function enableCurrency(Request $request)
|
public function enableCurrency(Request $request)
|
||||||
@@ -341,6 +339,8 @@ class CurrencyController extends Controller
|
|||||||
*
|
*
|
||||||
* @return Factory|View
|
* @return Factory|View
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function index(Request $request)
|
public function index(Request $request)
|
||||||
{
|
{
|
||||||
|
@@ -99,6 +99,7 @@ class HomeController extends Controller
|
|||||||
* @param AccountRepositoryInterface $repository
|
* @param AccountRepositoryInterface $repository
|
||||||
*
|
*
|
||||||
* @return mixed
|
* @return mixed
|
||||||
|
* @throws \FireflyIII\Exceptions\FireflyException
|
||||||
*/
|
*/
|
||||||
public function index(AccountRepositoryInterface $repository): mixed
|
public function index(AccountRepositoryInterface $repository): mixed
|
||||||
{
|
{
|
||||||
|
@@ -48,6 +48,8 @@ class JavascriptController extends Controller
|
|||||||
*
|
*
|
||||||
* @return Response
|
* @return Response
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function accounts(AccountRepositoryInterface $repository, CurrencyRepositoryInterface $currencyRepository): Response
|
public function accounts(AccountRepositoryInterface $repository, CurrencyRepositoryInterface $currencyRepository): Response
|
||||||
{
|
{
|
||||||
@@ -107,6 +109,9 @@ class JavascriptController extends Controller
|
|||||||
*
|
*
|
||||||
* @return Response
|
* @return Response
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \JsonException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function variables(Request $request, AccountRepositoryInterface $repository, CurrencyRepositoryInterface $currencyRepository): Response
|
public function variables(Request $request, AccountRepositoryInterface $repository, CurrencyRepositoryInterface $currencyRepository): Response
|
||||||
{
|
{
|
||||||
|
@@ -52,7 +52,6 @@ class BoxController extends Controller
|
|||||||
* 2) if the user has no available amount set this period: spent per day
|
* 2) if the user has no available amount set this period: spent per day
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws JsonException
|
|
||||||
*/
|
*/
|
||||||
public function available(): JsonResponse
|
public function available(): JsonResponse
|
||||||
{
|
{
|
||||||
@@ -131,7 +130,6 @@ class BoxController extends Controller
|
|||||||
* @param CurrencyRepositoryInterface $repository
|
* @param CurrencyRepositoryInterface $repository
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws JsonException
|
|
||||||
*/
|
*/
|
||||||
public function balance(CurrencyRepositoryInterface $repository): JsonResponse
|
public function balance(CurrencyRepositoryInterface $repository): JsonResponse
|
||||||
{
|
{
|
||||||
|
@@ -77,11 +77,13 @@ class ReconcileController extends Controller
|
|||||||
* Overview of reconciliation.
|
* Overview of reconciliation.
|
||||||
*
|
*
|
||||||
* @param Request $request
|
* @param Request $request
|
||||||
* @param Account $account
|
* @param Account|null $account
|
||||||
* @param Carbon $start
|
* @param Carbon|null $start
|
||||||
* @param Carbon $end
|
* @param Carbon|null $end
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
|
* @throws FireflyException
|
||||||
|
* @throws JsonException
|
||||||
*/
|
*/
|
||||||
public function overview(Request $request, Account $account = null, Carbon $start = null, Carbon $end = null): JsonResponse
|
public function overview(Request $request, Account $account = null, Carbon $start = null, Carbon $end = null): JsonResponse
|
||||||
{
|
{
|
||||||
@@ -217,8 +219,8 @@ class ReconcileController extends Controller
|
|||||||
* Returns a list of transactions in a modal.
|
* Returns a list of transactions in a modal.
|
||||||
*
|
*
|
||||||
* @param Account $account
|
* @param Account $account
|
||||||
* @param Carbon $start
|
* @param Carbon|null $start
|
||||||
* @param Carbon $end
|
* @param Carbon|null $end
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
@@ -143,6 +143,9 @@ class RecurrenceController extends Controller
|
|||||||
* @param Request $request
|
* @param Request $request
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function suggest(Request $request): JsonResponse
|
public function suggest(Request $request): JsonResponse
|
||||||
{
|
{
|
||||||
|
@@ -74,6 +74,8 @@ class IndexController extends Controller
|
|||||||
* @param Request $request
|
* @param Request $request
|
||||||
*
|
*
|
||||||
* @return Factory|View
|
* @return Factory|View
|
||||||
|
* @throws \FireflyIII\Exceptions\FireflyException
|
||||||
|
* @throws \JsonException
|
||||||
*/
|
*/
|
||||||
public function index(Request $request)
|
public function index(Request $request)
|
||||||
{
|
{
|
||||||
|
@@ -66,6 +66,8 @@ class PreferencesController extends Controller
|
|||||||
*
|
*
|
||||||
* @return Factory|View
|
* @return Factory|View
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function index(AccountRepositoryInterface $repository)
|
public function index(AccountRepositoryInterface $repository)
|
||||||
{
|
{
|
||||||
@@ -147,6 +149,8 @@ class PreferencesController extends Controller
|
|||||||
*
|
*
|
||||||
* @return RedirectResponse|Redirector
|
* @return RedirectResponse|Redirector
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function postIndex(Request $request)
|
public function postIndex(Request $request)
|
||||||
{
|
{
|
||||||
|
@@ -147,6 +147,8 @@ class ProfileController extends Controller
|
|||||||
* @throws IncompatibleWithGoogleAuthenticatorException
|
* @throws IncompatibleWithGoogleAuthenticatorException
|
||||||
* @throws InvalidCharactersException
|
* @throws InvalidCharactersException
|
||||||
* @throws SecretKeyTooShortException
|
* @throws SecretKeyTooShortException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function code(Request $request)
|
public function code(Request $request)
|
||||||
{
|
{
|
||||||
@@ -314,6 +316,8 @@ class ProfileController extends Controller
|
|||||||
*
|
*
|
||||||
* @return Factory|View
|
* @return Factory|View
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function index()
|
public function index()
|
||||||
{
|
{
|
||||||
@@ -479,6 +483,8 @@ class ProfileController extends Controller
|
|||||||
*
|
*
|
||||||
* @return RedirectResponse|Redirector
|
* @return RedirectResponse|Redirector
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function postCode(TokenFormRequest $request)
|
public function postCode(TokenFormRequest $request)
|
||||||
{
|
{
|
||||||
@@ -523,6 +529,8 @@ class ProfileController extends Controller
|
|||||||
* @param string $mfaCode
|
* @param string $mfaCode
|
||||||
*
|
*
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
private function addToMFAHistory(string $mfaCode): void
|
private function addToMFAHistory(string $mfaCode): void
|
||||||
{
|
{
|
||||||
|
@@ -75,7 +75,8 @@ class IndexController extends Controller
|
|||||||
*
|
*
|
||||||
* @return Factory|View
|
* @return Factory|View
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
*
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function index(Request $request)
|
public function index(Request $request)
|
||||||
{
|
{
|
||||||
|
@@ -45,7 +45,6 @@ class AccountController extends Controller
|
|||||||
* @param Carbon $end
|
* @param Carbon $end
|
||||||
*
|
*
|
||||||
* @return mixed|string
|
* @return mixed|string
|
||||||
* @throws JsonException
|
|
||||||
*/
|
*/
|
||||||
public function general(Collection $accounts, Carbon $start, Carbon $end)
|
public function general(Collection $accounts, Carbon $start, Carbon $end)
|
||||||
{
|
{
|
||||||
|
@@ -43,7 +43,6 @@ class BillController extends Controller
|
|||||||
* @param Carbon $end
|
* @param Carbon $end
|
||||||
*
|
*
|
||||||
* @return mixed|string
|
* @return mixed|string
|
||||||
* @throws JsonException
|
|
||||||
*/
|
*/
|
||||||
public function overview(Collection $accounts, Carbon $start, Carbon $end)
|
public function overview(Collection $accounts, Carbon $start, Carbon $end)
|
||||||
{ // chart properties for cache:
|
{ // chart properties for cache:
|
||||||
|
@@ -67,7 +67,6 @@ class OperationsController extends Controller
|
|||||||
* @param Carbon $end
|
* @param Carbon $end
|
||||||
*
|
*
|
||||||
* @return mixed|string
|
* @return mixed|string
|
||||||
* @throws JsonException
|
|
||||||
*/
|
*/
|
||||||
public function expenses(Collection $accounts, Carbon $start, Carbon $end)
|
public function expenses(Collection $accounts, Carbon $start, Carbon $end)
|
||||||
{
|
{
|
||||||
@@ -103,7 +102,6 @@ class OperationsController extends Controller
|
|||||||
* @param Carbon $end
|
* @param Carbon $end
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
* @throws JsonException
|
|
||||||
*/
|
*/
|
||||||
public function income(Collection $accounts, Carbon $start, Carbon $end): string
|
public function income(Collection $accounts, Carbon $start, Carbon $end): string
|
||||||
{
|
{
|
||||||
@@ -139,7 +137,6 @@ class OperationsController extends Controller
|
|||||||
* @param Carbon $end
|
* @param Carbon $end
|
||||||
*
|
*
|
||||||
* @return mixed|string
|
* @return mixed|string
|
||||||
* @throws JsonException
|
|
||||||
*/
|
*/
|
||||||
public function operations(Collection $accounts, Carbon $start, Carbon $end)
|
public function operations(Collection $accounts, Carbon $start, Carbon $end)
|
||||||
{
|
{
|
||||||
|
@@ -262,6 +262,8 @@ class ReportController extends Controller
|
|||||||
*
|
*
|
||||||
* @return Factory|View
|
* @return Factory|View
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function index(AccountRepositoryInterface $repository)
|
public function index(AccountRepositoryInterface $repository)
|
||||||
{
|
{
|
||||||
|
@@ -96,7 +96,7 @@ class CreateController extends Controller
|
|||||||
$operators = $search->getOperators()->toArray();
|
$operators = $search->getOperators()->toArray();
|
||||||
if ('' !== $words) {
|
if ('' !== $words) {
|
||||||
session()->flash('warning', trans('firefly.rule_from_search_words', ['string' => $words]));
|
session()->flash('warning', trans('firefly.rule_from_search_words', ['string' => $words]));
|
||||||
array_push($operators, ['type' => 'description_contains', 'value' => $words]);
|
$operators[] = ['type' => 'description_contains', 'value' => $words];
|
||||||
}
|
}
|
||||||
$oldTriggers = $this->parseFromOperators($operators);
|
$oldTriggers = $this->parseFromOperators($operators);
|
||||||
}
|
}
|
||||||
@@ -236,8 +236,7 @@ class CreateController extends Controller
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param Rule $rule
|
* @param Request $request
|
||||||
*
|
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
*/
|
*/
|
||||||
public function duplicate(Request $request): JsonResponse
|
public function duplicate(Request $request): JsonResponse
|
||||||
|
@@ -93,7 +93,7 @@ class EditController extends Controller
|
|||||||
$operators = $search->getOperators()->toArray();
|
$operators = $search->getOperators()->toArray();
|
||||||
if ('' !== $words) {
|
if ('' !== $words) {
|
||||||
session()->flash('warning', trans('firefly.rule_from_search_words', ['string' => $words]));
|
session()->flash('warning', trans('firefly.rule_from_search_words', ['string' => $words]));
|
||||||
array_push($operators, ['type' => 'description_contains', 'value' => $words]);
|
$operators[] = ['type' => 'description_contains', 'value' => $words];
|
||||||
}
|
}
|
||||||
$oldTriggers = $this->parseFromOperators($operators);
|
$oldTriggers = $this->parseFromOperators($operators);
|
||||||
}
|
}
|
||||||
|
@@ -230,6 +230,8 @@ class TagController extends Controller
|
|||||||
*
|
*
|
||||||
* @return Factory|View
|
* @return Factory|View
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function show(Request $request, Tag $tag, Carbon $start = null, Carbon $end = null)
|
public function show(Request $request, Tag $tag, Carbon $start = null, Carbon $end = null)
|
||||||
{
|
{
|
||||||
@@ -273,6 +275,8 @@ class TagController extends Controller
|
|||||||
*
|
*
|
||||||
* @return Factory|View
|
* @return Factory|View
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function showAll(Request $request, Tag $tag)
|
public function showAll(Request $request, Tag $tag)
|
||||||
{
|
{
|
||||||
|
@@ -100,6 +100,9 @@ class CreateController extends Controller
|
|||||||
*
|
*
|
||||||
* @return Factory|View
|
* @return Factory|View
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \JsonException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function create(?string $objectType)
|
public function create(?string $objectType)
|
||||||
{
|
{
|
||||||
|
@@ -73,7 +73,9 @@ class IndexController extends Controller
|
|||||||
* @param Carbon|null $end
|
* @param Carbon|null $end
|
||||||
*
|
*
|
||||||
* @return Factory|View
|
* @return Factory|View
|
||||||
* @throws Exception
|
* @throws \FireflyIII\Exceptions\FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function index(Request $request, string $objectType, Carbon $start = null, Carbon $end = null)
|
public function index(Request $request, string $objectType, Carbon $start = null, Carbon $end = null)
|
||||||
{
|
{
|
||||||
@@ -130,7 +132,9 @@ class IndexController extends Controller
|
|||||||
* @param string $objectType
|
* @param string $objectType
|
||||||
*
|
*
|
||||||
* @return Factory|View
|
* @return Factory|View
|
||||||
* @throws Exception
|
* @throws \FireflyIII\Exceptions\FireflyException
|
||||||
|
* @throws \Psr\Container\ContainerExceptionInterface
|
||||||
|
* @throws \Psr\Container\NotFoundExceptionInterface
|
||||||
*/
|
*/
|
||||||
public function indexAll(Request $request, string $objectType)
|
public function indexAll(Request $request, string $objectType)
|
||||||
{
|
{
|
||||||
|
@@ -153,8 +153,7 @@ class LinkController extends Controller
|
|||||||
/**
|
/**
|
||||||
* Switch link from A <> B to B <> A.
|
* Switch link from A <> B to B <> A.
|
||||||
*
|
*
|
||||||
* @param TransactionJournalLink $link
|
* @param Request $request
|
||||||
*
|
|
||||||
* @return RedirectResponse|Redirector
|
* @return RedirectResponse|Redirector
|
||||||
*/
|
*/
|
||||||
public function switchLink(Request $request)
|
public function switchLink(Request $request)
|
||||||
|
@@ -291,6 +291,8 @@ class CreateRecurringTransactions implements ShouldQueue
|
|||||||
* @param Recurrence $recurrence
|
* @param Recurrence $recurrence
|
||||||
*
|
*
|
||||||
* @return Collection
|
* @return Collection
|
||||||
|
* @throws DuplicateTransactionException
|
||||||
|
* @throws FireflyException
|
||||||
*/
|
*/
|
||||||
private function handleRepetitions(Recurrence $recurrence): Collection
|
private function handleRepetitions(Recurrence $recurrence): Collection
|
||||||
{
|
{
|
||||||
|
@@ -47,7 +47,6 @@ class ConfirmEmailChangeMail extends Mailable
|
|||||||
* @param string $newEmail
|
* @param string $newEmail
|
||||||
* @param string $oldEmail
|
* @param string $oldEmail
|
||||||
* @param string $url
|
* @param string $url
|
||||||
* @param string $ipAddress
|
|
||||||
*/
|
*/
|
||||||
public function __construct(string $newEmail, string $oldEmail, string $url)
|
public function __construct(string $newEmail, string $oldEmail, string $url)
|
||||||
{
|
{
|
||||||
|
@@ -38,7 +38,6 @@ class BroadcastServiceProvider extends ServiceProvider
|
|||||||
{
|
{
|
||||||
Broadcast::routes();
|
Broadcast::routes();
|
||||||
|
|
||||||
/** @noinspection PhpIncludeInspection */
|
|
||||||
require base_path('routes/channels.php');
|
require base_path('routes/channels.php');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -442,6 +442,7 @@ class AccountRepository implements AccountRepositoryInterface
|
|||||||
* @return Account|null
|
* @return Account|null
|
||||||
*
|
*
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws JsonException
|
||||||
*/
|
*/
|
||||||
public function getReconciliation(Account $account): ?Account
|
public function getReconciliation(Account $account): ?Account
|
||||||
{
|
{
|
||||||
@@ -754,6 +755,7 @@ class AccountRepository implements AccountRepositoryInterface
|
|||||||
*
|
*
|
||||||
* @return Account
|
* @return Account
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws JsonException
|
||||||
*/
|
*/
|
||||||
public function store(array $data): Account
|
public function store(array $data): Account
|
||||||
{
|
{
|
||||||
@@ -770,7 +772,6 @@ class AccountRepository implements AccountRepositoryInterface
|
|||||||
*
|
*
|
||||||
* @return Account
|
* @return Account
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
* @throws JsonException
|
|
||||||
*/
|
*/
|
||||||
public function update(Account $account, array $data): Account
|
public function update(Account $account, array $data): Account
|
||||||
{
|
{
|
||||||
|
@@ -45,6 +45,8 @@ class AccountTasker implements AccountTaskerInterface
|
|||||||
* @param Carbon $end
|
* @param Carbon $end
|
||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
|
* @throws \FireflyIII\Exceptions\FireflyException
|
||||||
|
* @throws \JsonException
|
||||||
*/
|
*/
|
||||||
public function getAccountReport(Collection $accounts, Carbon $start, Carbon $end): array
|
public function getAccountReport(Collection $accounts, Carbon $start, Carbon $end): array
|
||||||
{
|
{
|
||||||
@@ -150,6 +152,8 @@ class AccountTasker implements AccountTaskerInterface
|
|||||||
* @param array $array
|
* @param array $array
|
||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
|
* @throws \FireflyIII\Exceptions\FireflyException
|
||||||
|
* @throws \JsonException
|
||||||
*/
|
*/
|
||||||
private function groupExpenseByDestination(array $array): array
|
private function groupExpenseByDestination(array $array): array
|
||||||
{
|
{
|
||||||
@@ -243,6 +247,8 @@ class AccountTasker implements AccountTaskerInterface
|
|||||||
* @param array $array
|
* @param array $array
|
||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
|
* @throws \FireflyIII\Exceptions\FireflyException
|
||||||
|
* @throws \JsonException
|
||||||
*/
|
*/
|
||||||
private function groupIncomeBySource(array $array): array
|
private function groupIncomeBySource(array $array): array
|
||||||
{
|
{
|
||||||
|
@@ -358,6 +358,7 @@ class BillRepository implements BillRepositoryInterface
|
|||||||
* @param Carbon $end
|
* @param Carbon $end
|
||||||
*
|
*
|
||||||
* @return Collection
|
* @return Collection
|
||||||
|
* @throws JsonException
|
||||||
*/
|
*/
|
||||||
public function getPayDatesInRange(Bill $bill, Carbon $start, Carbon $end): Collection
|
public function getPayDatesInRange(Bill $bill, Carbon $start, Carbon $end): Collection
|
||||||
{
|
{
|
||||||
@@ -393,7 +394,6 @@ class BillRepository implements BillRepositoryInterface
|
|||||||
* @param Carbon $date
|
* @param Carbon $date
|
||||||
*
|
*
|
||||||
* @return Carbon
|
* @return Carbon
|
||||||
* @throws JsonException
|
|
||||||
*/
|
*/
|
||||||
public function nextDateMatch(Bill $bill, Carbon $date): Carbon
|
public function nextDateMatch(Bill $bill, Carbon $date): Carbon
|
||||||
{
|
{
|
||||||
|
@@ -304,6 +304,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
|
|||||||
*
|
*
|
||||||
* @return BudgetLimit
|
* @return BudgetLimit
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \JsonException
|
||||||
*/
|
*/
|
||||||
public function store(array $data): BudgetLimit
|
public function store(array $data): BudgetLimit
|
||||||
{
|
{
|
||||||
@@ -352,6 +353,8 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
|
|||||||
* @param array $data
|
* @param array $data
|
||||||
*
|
*
|
||||||
* @return BudgetLimit
|
* @return BudgetLimit
|
||||||
|
* @throws FireflyException
|
||||||
|
* @throws \JsonException
|
||||||
*/
|
*/
|
||||||
public function update(BudgetLimit $budgetLimit, array $data): BudgetLimit
|
public function update(BudgetLimit $budgetLimit, array $data): BudgetLimit
|
||||||
{
|
{
|
||||||
|
@@ -335,6 +335,7 @@ class BudgetRepository implements BudgetRepositoryInterface
|
|||||||
*
|
*
|
||||||
* @return Budget
|
* @return Budget
|
||||||
* @throws FireflyException
|
* @throws FireflyException
|
||||||
|
* @throws \JsonException
|
||||||
*/
|
*/
|
||||||
public function store(array $data): Budget
|
public function store(array $data): Budget
|
||||||
{
|
{
|
||||||
@@ -549,6 +550,8 @@ class BudgetRepository implements BudgetRepositoryInterface
|
|||||||
/**
|
/**
|
||||||
* @param Budget $budget
|
* @param Budget $budget
|
||||||
* @param array $data
|
* @param array $data
|
||||||
|
* @throws FireflyException
|
||||||
|
* @throws \JsonException
|
||||||
*/
|
*/
|
||||||
private function updateAutoBudget(Budget $budget, array $data): void
|
private function updateAutoBudget(Budget $budget, array $data): void
|
||||||
{
|
{
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user