mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-09-18 18:44:16 +00:00
Clean up code.
This commit is contained in:
@@ -97,6 +97,7 @@ abstract class Controller extends BaseController
|
||||
// some date fields:
|
||||
$dates = ['start', 'end', 'date'];
|
||||
foreach ($dates as $field) {
|
||||
$date = null;
|
||||
try {
|
||||
$date = request()->query->get($field);
|
||||
} catch (BadRequestException $e) {
|
||||
|
@@ -44,7 +44,7 @@ class ShowController extends Controller
|
||||
/**
|
||||
* BillController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
@@ -67,7 +67,7 @@ class ShowController extends Controller
|
||||
*
|
||||
* @return JsonResponse
|
||||
* @throws FireflyException
|
||||
|
||||
|
||||
*/
|
||||
public function index(): JsonResponse
|
||||
{
|
||||
@@ -98,7 +98,7 @@ class ShowController extends Controller
|
||||
* @param Bill $bill
|
||||
*
|
||||
* @return JsonResponse
|
||||
|
||||
|
||||
*/
|
||||
public function show(Bill $bill): JsonResponse
|
||||
{
|
||||
|
@@ -44,7 +44,7 @@ class StoreController extends Controller
|
||||
/**
|
||||
* BillController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
@@ -41,7 +41,7 @@ class UpdateController extends Controller
|
||||
/**
|
||||
* BillController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
@@ -41,7 +41,7 @@ class StoreController extends Controller
|
||||
/**
|
||||
* StoreController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
@@ -41,7 +41,7 @@ class UpdateController extends Controller
|
||||
/**
|
||||
* UpdateController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
@@ -47,7 +47,7 @@ class UpdateController extends Controller
|
||||
*
|
||||
* BudgetLimitController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
@@ -38,7 +38,7 @@ class DestroyController extends Controller
|
||||
/**
|
||||
* CategoryController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
@@ -62,7 +62,7 @@ class DestroyController extends Controller
|
||||
* @param Category $category
|
||||
*
|
||||
* @return JsonResponse
|
||||
|
||||
|
||||
*/
|
||||
public function destroy(Category $category): JsonResponse
|
||||
{
|
||||
|
@@ -50,7 +50,7 @@ class ListController extends Controller
|
||||
/**
|
||||
* CategoryController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
@@ -73,7 +73,7 @@ class ListController extends Controller
|
||||
*
|
||||
* @return JsonResponse
|
||||
* @throws FireflyException
|
||||
|
||||
|
||||
*/
|
||||
public function attachments(Category $category): JsonResponse
|
||||
{
|
||||
@@ -110,7 +110,7 @@ class ListController extends Controller
|
||||
*
|
||||
* @return JsonResponse
|
||||
* @throws FireflyException
|
||||
|
||||
|
||||
*/
|
||||
public function transactions(Request $request, Category $category): JsonResponse
|
||||
{
|
||||
|
@@ -44,7 +44,7 @@ class ShowController extends Controller
|
||||
/**
|
||||
* CategoryController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
@@ -67,7 +67,7 @@ class ShowController extends Controller
|
||||
*
|
||||
* @return JsonResponse
|
||||
* @throws FireflyException
|
||||
|
||||
|
||||
*/
|
||||
public function index(): JsonResponse
|
||||
{
|
||||
@@ -103,7 +103,7 @@ class ShowController extends Controller
|
||||
* @param Category $category
|
||||
*
|
||||
* @return JsonResponse
|
||||
|
||||
|
||||
*/
|
||||
public function show(Category $category): JsonResponse
|
||||
{
|
||||
|
@@ -39,7 +39,7 @@ class DestroyController extends Controller
|
||||
/**
|
||||
* ObjectGroupController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
@@ -64,7 +64,7 @@ class DestroyController extends Controller
|
||||
*
|
||||
* @param ObjectGroup $objectGroup
|
||||
*
|
||||
|
||||
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function destroy(ObjectGroup $objectGroup): JsonResponse
|
||||
|
@@ -46,7 +46,7 @@ class ShowController extends Controller
|
||||
/**
|
||||
* ObjectGroupController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
@@ -73,7 +73,7 @@ class ShowController extends Controller
|
||||
*
|
||||
* @return JsonResponse
|
||||
* @throws FireflyException
|
||||
|
||||
|
||||
*/
|
||||
public function index(Request $request): JsonResponse
|
||||
{
|
||||
|
@@ -42,7 +42,7 @@ class UpdateController extends Controller
|
||||
/**
|
||||
* ObjectGroupController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
@@ -41,7 +41,7 @@ class StoreController extends Controller
|
||||
/**
|
||||
* Constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
@@ -41,7 +41,7 @@ class UpdateController extends Controller
|
||||
/**
|
||||
* Constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
@@ -45,7 +45,7 @@ class ShowController extends Controller
|
||||
/**
|
||||
* RuleController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
@@ -71,7 +71,7 @@ class ShowController extends Controller
|
||||
*
|
||||
* @return JsonResponse
|
||||
* @throws FireflyException
|
||||
|
||||
|
||||
*/
|
||||
public function index(): JsonResponse
|
||||
{
|
||||
@@ -108,7 +108,7 @@ class ShowController extends Controller
|
||||
* @param Rule $rule
|
||||
*
|
||||
* @return JsonResponse
|
||||
|
||||
|
||||
*/
|
||||
public function show(Rule $rule): JsonResponse
|
||||
{
|
||||
|
@@ -44,7 +44,7 @@ class ListController extends Controller
|
||||
/**
|
||||
* RuleGroupController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
@@ -70,7 +70,7 @@ class ListController extends Controller
|
||||
*
|
||||
* @return JsonResponse
|
||||
* @throws FireflyException
|
||||
|
||||
|
||||
*/
|
||||
public function rules(RuleGroup $group): JsonResponse
|
||||
{
|
||||
|
@@ -43,7 +43,7 @@ class StoreController extends Controller
|
||||
/**
|
||||
* RuleGroupController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
@@ -39,7 +39,7 @@ class DestroyController extends Controller
|
||||
/**
|
||||
* TagController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
@@ -66,7 +66,7 @@ class DestroyController extends Controller
|
||||
* @param Tag $tag
|
||||
*
|
||||
* @return JsonResponse
|
||||
|
||||
|
||||
*/
|
||||
public function destroy(Tag $tag): JsonResponse
|
||||
{
|
||||
|
@@ -50,7 +50,7 @@ class ListController extends Controller
|
||||
/**
|
||||
* TagController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
@@ -76,7 +76,7 @@ class ListController extends Controller
|
||||
*
|
||||
* @return JsonResponse
|
||||
* @throws FireflyException
|
||||
|
||||
|
||||
*/
|
||||
public function attachments(Tag $tag): JsonResponse
|
||||
{
|
||||
@@ -112,7 +112,7 @@ class ListController extends Controller
|
||||
*
|
||||
* @return JsonResponse
|
||||
* @throws FireflyException
|
||||
|
||||
|
||||
*/
|
||||
public function transactions(Request $request, Tag $tag): JsonResponse
|
||||
{
|
||||
|
@@ -51,7 +51,7 @@ class ShowController extends Controller
|
||||
/**
|
||||
* CurrencyRepository constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
@@ -75,7 +75,7 @@ class ShowController extends Controller
|
||||
* @return JsonResponse
|
||||
* @throws FireflyException
|
||||
* @throws JsonException
|
||||
|
||||
|
||||
*/
|
||||
public function index(): JsonResponse
|
||||
{
|
||||
@@ -111,7 +111,7 @@ class ShowController extends Controller
|
||||
* @return JsonResponse
|
||||
* @throws FireflyException
|
||||
* @throws JsonException
|
||||
|
||||
|
||||
*/
|
||||
public function show(TransactionCurrency $currency): JsonResponse
|
||||
{
|
||||
@@ -137,7 +137,7 @@ class ShowController extends Controller
|
||||
* @return JsonResponse
|
||||
* @throws FireflyException
|
||||
* @throws JsonException
|
||||
|
||||
|
||||
*/
|
||||
public function showDefault(): JsonResponse
|
||||
{
|
||||
|
@@ -50,7 +50,7 @@ class UpdateController extends Controller
|
||||
/**
|
||||
* CurrencyRepository constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
@@ -76,7 +76,7 @@ class UpdateController extends Controller
|
||||
* @return JsonResponse
|
||||
* @throws FireflyException
|
||||
* @throws JsonException
|
||||
|
||||
|
||||
*/
|
||||
public function disable(TransactionCurrency $currency): JsonResponse
|
||||
{
|
||||
@@ -109,7 +109,7 @@ class UpdateController extends Controller
|
||||
*
|
||||
* @return JsonResponse
|
||||
* @throws FireflyException
|
||||
|
||||
|
||||
*/
|
||||
public function makeDefault(TransactionCurrency $currency): JsonResponse
|
||||
{
|
||||
@@ -142,7 +142,7 @@ class UpdateController extends Controller
|
||||
* @return JsonResponse
|
||||
* @throws FireflyException
|
||||
* @throws JsonException
|
||||
|
||||
|
||||
*/
|
||||
public function enable(TransactionCurrency $currency): JsonResponse
|
||||
{
|
||||
|
@@ -37,7 +37,7 @@ class DestroyController extends Controller
|
||||
/**
|
||||
* TransactionLinkController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
@@ -65,7 +65,7 @@ class DestroyController extends Controller
|
||||
* @param TransactionJournalLink $link
|
||||
*
|
||||
* @return JsonResponse
|
||||
|
||||
|
||||
*/
|
||||
public function destroy(TransactionJournalLink $link): JsonResponse
|
||||
{
|
||||
|
@@ -44,7 +44,7 @@ class ShowController extends Controller
|
||||
/**
|
||||
* TransactionLinkController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
@@ -73,7 +73,7 @@ class ShowController extends Controller
|
||||
*
|
||||
* @return JsonResponse
|
||||
* @throws FireflyException
|
||||
|
||||
|
||||
*/
|
||||
public function index(Request $request): JsonResponse
|
||||
{
|
||||
@@ -114,7 +114,7 @@ class ShowController extends Controller
|
||||
* @param TransactionJournalLink $journalLink
|
||||
*
|
||||
* @return JsonResponse
|
||||
|
||||
|
||||
*/
|
||||
public function show(TransactionJournalLink $journalLink): JsonResponse
|
||||
{
|
||||
|
@@ -28,7 +28,6 @@ use FireflyIII\Api\V1\Controllers\Controller;
|
||||
use FireflyIII\Exceptions\FireflyException;
|
||||
use FireflyIII\Models\LinkType;
|
||||
use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
|
||||
use FireflyIII\Repositories\User\UserRepositoryInterface;
|
||||
use FireflyIII\Support\Http\Api\TransactionFilter;
|
||||
use FireflyIII\User;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
@@ -41,7 +40,6 @@ class DestroyController extends Controller
|
||||
use TransactionFilter;
|
||||
|
||||
private LinkTypeRepositoryInterface $repository;
|
||||
private UserRepositoryInterface $userRepository;
|
||||
|
||||
/**
|
||||
* LinkTypeController constructor.
|
||||
@@ -54,9 +52,8 @@ class DestroyController extends Controller
|
||||
$this->middleware(
|
||||
function ($request, $next) {
|
||||
/** @var User $user */
|
||||
$user = auth()->user();
|
||||
$this->repository = app(LinkTypeRepositoryInterface::class);
|
||||
$this->userRepository = app(UserRepositoryInterface::class);
|
||||
$user = auth()->user();
|
||||
$this->repository = app(LinkTypeRepositoryInterface::class);
|
||||
$this->repository->setUser($user);
|
||||
|
||||
return $next($request);
|
||||
@@ -74,7 +71,6 @@ class DestroyController extends Controller
|
||||
*
|
||||
* @return JsonResponse
|
||||
* @throws FireflyException
|
||||
|
||||
*/
|
||||
public function destroy(LinkType $linkType): JsonResponse
|
||||
{
|
||||
|
@@ -50,7 +50,7 @@ class ListController extends Controller
|
||||
/**
|
||||
* LinkTypeController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
@@ -76,7 +76,7 @@ class ListController extends Controller
|
||||
*
|
||||
* @return JsonResponse
|
||||
* @throws FireflyException
|
||||
|
||||
|
||||
*/
|
||||
public function transactions(Request $request, LinkType $linkType): JsonResponse
|
||||
{
|
||||
|
@@ -50,7 +50,7 @@ class ShowController extends Controller
|
||||
/**
|
||||
* LinkTypeController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
@@ -74,7 +74,7 @@ class ShowController extends Controller
|
||||
*
|
||||
* @return JsonResponse
|
||||
* @throws FireflyException
|
||||
|
||||
|
||||
*/
|
||||
public function index(): JsonResponse
|
||||
{
|
||||
@@ -110,7 +110,7 @@ class ShowController extends Controller
|
||||
* @param LinkType $linkType
|
||||
*
|
||||
* @return JsonResponse
|
||||
|
||||
|
||||
*/
|
||||
public function show(LinkType $linkType): JsonResponse
|
||||
{
|
||||
|
@@ -49,7 +49,7 @@ class StoreController extends Controller
|
||||
/**
|
||||
* LinkTypeController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
@@ -41,7 +41,7 @@ class MessageController extends Controller
|
||||
private WebhookRepositoryInterface $repository;
|
||||
|
||||
/**
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
@@ -92,6 +92,7 @@ class Controller extends BaseController
|
||||
|
||||
// some date fields:
|
||||
foreach ($dates as $field) {
|
||||
$date = null;
|
||||
try {
|
||||
$date = request()->query->get($field);
|
||||
} catch (BadRequestException $e) {
|
||||
|
@@ -74,7 +74,7 @@ class FixAccountOrder extends Command
|
||||
* executed. This leads to noticeable slow-downs and class calls. To prevent this, this method should
|
||||
* be called from the handle method instead of using the constructor to initialize the command.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
private function stupidLaravel(): void
|
||||
{
|
||||
|
@@ -92,7 +92,7 @@ class CreateFirstUser extends Command
|
||||
* executed. This leads to noticeable slow-downs and class calls. To prevent this, this method should
|
||||
* be called from the handle method instead of using the constructor to initialize the command.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
private function stupidLaravel(): void
|
||||
{
|
||||
|
@@ -108,7 +108,7 @@ class MigrateToRules extends Command
|
||||
* executed. This leads to noticeable slow-downs and class calls. To prevent this, this method should
|
||||
* be called from the handle method instead of using the constructor to initialize the command.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
private function stupidLaravel(): void
|
||||
{
|
||||
|
@@ -160,7 +160,7 @@ class UpgradeLiabilitiesEight extends Command
|
||||
|
||||
/**
|
||||
* @param $account
|
||||
* @return void
|
||||
* @return int
|
||||
*/
|
||||
private function deleteTransactions($account): int
|
||||
{
|
||||
@@ -279,9 +279,9 @@ class UpgradeLiabilitiesEight extends Command
|
||||
->where('transactions.account_id', $account->id)
|
||||
->where('transaction_journals.transaction_type_id', $openingBalanceType->id)
|
||||
->first(['transaction_journals.*']);
|
||||
/** @var Transaction $source */
|
||||
/** @var Transaction|null $source */
|
||||
$source = $openingJournal->transactions()->where('amount', '<', 0)->first();
|
||||
/** @var Transaction $dest */
|
||||
/** @var Transaction|null $dest */
|
||||
$dest = $openingJournal->transactions()->where('amount', '>', 0)->first();
|
||||
if ($source && $dest) {
|
||||
$sourceId = $source->account_id;
|
||||
|
@@ -221,7 +221,7 @@ class GracefulNotFoundHandler extends ExceptionHandler
|
||||
$user = auth()->user();
|
||||
$route = $request->route();
|
||||
$attachmentId = (int)$route->parameter('attachment');
|
||||
/** @var Attachment $attachment */
|
||||
/** @var Attachment|null $attachment */
|
||||
$attachment = $user->attachments()->withTrashed()->find($attachmentId);
|
||||
if (null === $attachment) {
|
||||
Log::error(sprintf('Could not find attachment %d, so give big fat error.', $attachmentId));
|
||||
|
@@ -47,7 +47,7 @@ class TransactionFactory
|
||||
/**
|
||||
* Constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
@@ -156,7 +156,7 @@ class TransactionFactory
|
||||
/**
|
||||
* @param Account $account
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function setAccount(Account $account): void
|
||||
{
|
||||
@@ -166,7 +166,7 @@ class TransactionFactory
|
||||
/**
|
||||
* @param TransactionCurrency $currency
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function setCurrency(TransactionCurrency $currency): void
|
||||
{
|
||||
@@ -176,7 +176,7 @@ class TransactionFactory
|
||||
/**
|
||||
* @param TransactionCurrency|null $foreignCurrency |null
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function setForeignCurrency(?TransactionCurrency $foreignCurrency): void
|
||||
{
|
||||
@@ -186,7 +186,7 @@ class TransactionFactory
|
||||
/**
|
||||
* @param TransactionJournal $journal
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function setJournal(TransactionJournal $journal): void
|
||||
{
|
||||
@@ -196,7 +196,7 @@ class TransactionFactory
|
||||
/**
|
||||
* @param bool $reconciled
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function setReconciled(bool $reconciled): void
|
||||
{
|
||||
@@ -206,7 +206,7 @@ class TransactionFactory
|
||||
/**
|
||||
* @param User $user
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function setUser(User $user): void
|
||||
{
|
||||
|
@@ -73,7 +73,7 @@ class TransactionJournalFactory
|
||||
* Constructor.
|
||||
*
|
||||
* @throws Exception
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
@@ -51,7 +51,7 @@ class IndexController extends Controller
|
||||
/**
|
||||
* IndexController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
@@ -55,7 +55,7 @@ class ReconcileController extends Controller
|
||||
/**
|
||||
* ReconcileController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
@@ -53,7 +53,7 @@ class ShowController extends Controller
|
||||
/**
|
||||
* ShowController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
@@ -45,7 +45,7 @@ class CreateController extends Controller
|
||||
/**
|
||||
* CreateController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
@@ -51,7 +51,7 @@ class CategoryReportController extends Controller
|
||||
/**
|
||||
* CategoryReportController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
@@ -53,7 +53,7 @@ class ExpenseReportController extends Controller
|
||||
/**
|
||||
* ExpenseReportController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
@@ -51,7 +51,7 @@ abstract class Controller extends BaseController
|
||||
/**
|
||||
* Controller constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
@@ -47,7 +47,7 @@ class BudgetController extends Controller
|
||||
/**
|
||||
* IndexController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
@@ -44,7 +44,7 @@ class RecurrenceController extends Controller
|
||||
/**
|
||||
* RecurrenceController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
@@ -43,7 +43,7 @@ class IndexController extends Controller
|
||||
/**
|
||||
* IndexController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
@@ -51,7 +51,7 @@ class IndexController extends Controller
|
||||
/**
|
||||
* PiggyBankController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
@@ -53,7 +53,7 @@ class CreateController extends Controller
|
||||
/**
|
||||
* CreateController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
@@ -48,7 +48,7 @@ class ShowController extends Controller
|
||||
/**
|
||||
* IndexController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
@@ -43,7 +43,7 @@ class OperationsController extends Controller
|
||||
/**
|
||||
* OperationsController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
@@ -52,7 +52,7 @@ class CreateController extends Controller
|
||||
/**
|
||||
* RuleController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
@@ -44,7 +44,7 @@ class EditController extends Controller
|
||||
/**
|
||||
* EditController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
@@ -54,7 +54,7 @@ class MassController extends Controller
|
||||
/**
|
||||
* MassController constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
@@ -239,7 +239,7 @@ class MassController extends Controller
|
||||
* @param string $key
|
||||
*
|
||||
* @return Carbon|null
|
||||
|
||||
|
||||
*/
|
||||
private function getDateFromRequest(MassEditJournalRequest $request, int $journalId, string $key): ?Carbon
|
||||
{
|
||||
@@ -267,7 +267,7 @@ class MassController extends Controller
|
||||
* @param string $string
|
||||
*
|
||||
* @return string|null
|
||||
|
||||
|
||||
*/
|
||||
private function getStringFromRequest(MassEditJournalRequest $request, int $journalId, string $string): ?string
|
||||
{
|
||||
@@ -288,7 +288,7 @@ class MassController extends Controller
|
||||
* @param string $string
|
||||
*
|
||||
* @return int|null
|
||||
|
||||
|
||||
*/
|
||||
private function getIntFromRequest(MassEditJournalRequest $request, int $journalId, string $string): ?int
|
||||
{
|
||||
|
@@ -79,7 +79,7 @@ class CurrencyExchangeRate extends Model
|
||||
protected $fillable = ['user_id', 'from_currency_id', 'to_currency_id', 'date', 'rate'];
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* @return BelongsTo
|
||||
*/
|
||||
public function fromCurrency(): BelongsTo
|
||||
@@ -88,7 +88,7 @@ class CurrencyExchangeRate extends Model
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* @return BelongsTo
|
||||
*/
|
||||
public function toCurrency(): BelongsTo
|
||||
@@ -97,7 +97,7 @@ class CurrencyExchangeRate extends Model
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* @return BelongsTo
|
||||
*/
|
||||
public function user(): BelongsTo
|
||||
|
@@ -91,7 +91,7 @@ class RecurrenceRepetition extends Model
|
||||
|
||||
/**
|
||||
* @return BelongsTo
|
||||
|
||||
|
||||
*/
|
||||
public function recurrence(): BelongsTo
|
||||
{
|
||||
|
@@ -112,7 +112,7 @@ class RecurrenceTransaction extends Model
|
||||
protected $table = 'recurrences_transactions';
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* @return BelongsTo
|
||||
*/
|
||||
public function destinationAccount(): BelongsTo
|
||||
@@ -121,7 +121,7 @@ class RecurrenceTransaction extends Model
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* @return BelongsTo
|
||||
*/
|
||||
public function foreignCurrency(): BelongsTo
|
||||
@@ -131,7 +131,7 @@ class RecurrenceTransaction extends Model
|
||||
|
||||
/**
|
||||
* @return BelongsTo
|
||||
|
||||
|
||||
*/
|
||||
public function recurrence(): BelongsTo
|
||||
{
|
||||
@@ -140,7 +140,7 @@ class RecurrenceTransaction extends Model
|
||||
|
||||
/**
|
||||
* @return HasMany
|
||||
|
||||
|
||||
*/
|
||||
public function recurrenceTransactionMeta(): HasMany
|
||||
{
|
||||
@@ -148,7 +148,7 @@ class RecurrenceTransaction extends Model
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* @return BelongsTo
|
||||
*/
|
||||
public function sourceAccount(): BelongsTo
|
||||
@@ -157,7 +157,7 @@ class RecurrenceTransaction extends Model
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* @return BelongsTo
|
||||
*/
|
||||
public function transactionCurrency(): BelongsTo
|
||||
@@ -166,7 +166,7 @@ class RecurrenceTransaction extends Model
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* @return BelongsTo
|
||||
*/
|
||||
public function transactionType(): BelongsTo
|
||||
|
@@ -80,7 +80,7 @@ class RecurrenceTransactionMeta extends Model
|
||||
|
||||
/**
|
||||
* @return BelongsTo
|
||||
|
||||
|
||||
*/
|
||||
public function recurrenceTransaction(): BelongsTo
|
||||
{
|
||||
|
@@ -96,7 +96,7 @@ class TransactionType extends Model
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* @return bool
|
||||
*/
|
||||
public function isDeposit(): bool
|
||||
@@ -105,7 +105,7 @@ class TransactionType extends Model
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* @return bool
|
||||
*/
|
||||
public function isOpeningBalance(): bool
|
||||
@@ -114,7 +114,7 @@ class TransactionType extends Model
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* @return bool
|
||||
*/
|
||||
public function isTransfer(): bool
|
||||
@@ -123,7 +123,7 @@ class TransactionType extends Model
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* @return bool
|
||||
*/
|
||||
public function isWithdrawal(): bool
|
||||
@@ -132,7 +132,7 @@ class TransactionType extends Model
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* @return HasMany
|
||||
*/
|
||||
public function transactionJournals(): HasMany
|
||||
|
@@ -195,7 +195,7 @@ class Webhook extends Model
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* @return BelongsTo
|
||||
*/
|
||||
public function user(): BelongsTo
|
||||
@@ -204,7 +204,7 @@ class Webhook extends Model
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* @return HasMany
|
||||
*/
|
||||
public function webhookMessages(): HasMany
|
||||
|
@@ -37,7 +37,7 @@ class IsAssetAccountId implements Rule
|
||||
* Get the validation error message. This is not translated because only the API uses it.
|
||||
*
|
||||
* @return string
|
||||
|
||||
|
||||
*/
|
||||
public function message(): string
|
||||
{
|
||||
|
@@ -34,7 +34,7 @@ class IsBoolean implements Rule
|
||||
/**
|
||||
* Get the validation error message.
|
||||
*
|
||||
|
||||
|
||||
* @return string
|
||||
*/
|
||||
public function message(): string
|
||||
|
@@ -54,7 +54,7 @@ trait JournalServiceTrait
|
||||
* @param array $data
|
||||
*
|
||||
* @return Account|null
|
||||
|
||||
|
||||
* @throws FireflyException
|
||||
*/
|
||||
protected function getAccount(string $transactionType, string $direction, array $data): ?Account
|
||||
@@ -329,7 +329,7 @@ trait JournalServiceTrait
|
||||
*
|
||||
* @return string
|
||||
* @throws FireflyException
|
||||
|
||||
|
||||
*/
|
||||
protected function getAmount(string $amount): string
|
||||
{
|
||||
@@ -348,7 +348,7 @@ trait JournalServiceTrait
|
||||
* @param string|null $amount
|
||||
*
|
||||
* @return string|null
|
||||
|
||||
|
||||
*/
|
||||
protected function getForeignAmount(?string $amount): ?string
|
||||
{
|
||||
@@ -376,7 +376,7 @@ trait JournalServiceTrait
|
||||
* @param TransactionJournal $journal
|
||||
* @param NullArrayObject $data
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
protected function storeBudget(TransactionJournal $journal, NullArrayObject $data): void
|
||||
{
|
||||
@@ -400,7 +400,7 @@ trait JournalServiceTrait
|
||||
* @param TransactionJournal $journal
|
||||
* @param NullArrayObject $data
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
protected function storeCategory(TransactionJournal $journal, NullArrayObject $data): void
|
||||
{
|
||||
@@ -419,7 +419,7 @@ trait JournalServiceTrait
|
||||
* @param TransactionJournal $journal
|
||||
* @param string|null $notes
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
protected function storeNotes(TransactionJournal $journal, ?string $notes): void
|
||||
{
|
||||
@@ -448,7 +448,7 @@ trait JournalServiceTrait
|
||||
* @param TransactionJournal $journal
|
||||
* @param array|null $tags
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
protected function storeTags(TransactionJournal $journal, ?array $tags): void
|
||||
{
|
||||
|
@@ -83,7 +83,7 @@ class OperatorQuerySearch implements SearchInterface
|
||||
/**
|
||||
* OperatorQuerySearch constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
@@ -115,7 +115,7 @@ class OperatorQuerySearch implements SearchInterface
|
||||
|
||||
/**
|
||||
* @inheritDoc
|
||||
|
||||
|
||||
*/
|
||||
public function getModifiers(): Collection
|
||||
{
|
||||
@@ -124,7 +124,7 @@ class OperatorQuerySearch implements SearchInterface
|
||||
|
||||
/**
|
||||
* @inheritDoc
|
||||
|
||||
|
||||
*/
|
||||
public function getOperators(): Collection
|
||||
{
|
||||
@@ -133,7 +133,7 @@ class OperatorQuerySearch implements SearchInterface
|
||||
|
||||
/**
|
||||
* @inheritDoc
|
||||
|
||||
|
||||
*/
|
||||
public function getWordsAsString(): string
|
||||
{
|
||||
@@ -142,7 +142,7 @@ class OperatorQuerySearch implements SearchInterface
|
||||
|
||||
/**
|
||||
* @inheritDoc
|
||||
|
||||
|
||||
*/
|
||||
public function hasModifiers(): bool
|
||||
{
|
||||
@@ -1992,7 +1992,7 @@ class OperatorQuerySearch implements SearchInterface
|
||||
|
||||
/**
|
||||
* @inheritDoc
|
||||
|
||||
|
||||
*/
|
||||
public function searchTime(): float
|
||||
{
|
||||
@@ -2029,7 +2029,7 @@ class OperatorQuerySearch implements SearchInterface
|
||||
|
||||
/**
|
||||
* @inheritDoc
|
||||
|
||||
|
||||
*/
|
||||
public function setPage(int $page): void
|
||||
{
|
||||
@@ -2039,7 +2039,7 @@ class OperatorQuerySearch implements SearchInterface
|
||||
|
||||
/**
|
||||
* @inheritDoc
|
||||
|
||||
|
||||
*/
|
||||
public function setUser(User $user): void
|
||||
{
|
||||
|
@@ -42,7 +42,7 @@ class BillTransformer extends AbstractTransformer
|
||||
/**
|
||||
* BillTransformer constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
@@ -38,7 +38,7 @@ class BudgetTransformer extends AbstractTransformer
|
||||
/**
|
||||
* BudgetTransformer constructor.
|
||||
*
|
||||
|
||||
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
46
app/User.php
46
app/User.php
@@ -218,7 +218,7 @@ class User extends Authenticatable
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* Link to accounts.
|
||||
*
|
||||
* @return HasMany
|
||||
@@ -229,7 +229,7 @@ class User extends Authenticatable
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* Link to attachments
|
||||
*
|
||||
* @return HasMany
|
||||
@@ -240,7 +240,7 @@ class User extends Authenticatable
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* Link to available budgets
|
||||
*
|
||||
* @return HasMany
|
||||
@@ -251,7 +251,7 @@ class User extends Authenticatable
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* Link to bills.
|
||||
*
|
||||
* @return HasMany
|
||||
@@ -262,7 +262,7 @@ class User extends Authenticatable
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* Link to budgets.
|
||||
*
|
||||
* @return HasMany
|
||||
@@ -273,7 +273,7 @@ class User extends Authenticatable
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* Link to categories
|
||||
*
|
||||
* @return HasMany
|
||||
@@ -284,7 +284,7 @@ class User extends Authenticatable
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* Link to currency exchange rates
|
||||
*
|
||||
* @return HasMany
|
||||
@@ -295,7 +295,7 @@ class User extends Authenticatable
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* Generates access token.
|
||||
*
|
||||
* @return string
|
||||
@@ -353,7 +353,7 @@ class User extends Authenticatable
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
*
|
||||
* @return HasMany
|
||||
*/
|
||||
@@ -378,7 +378,7 @@ class User extends Authenticatable
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* Link to object groups.
|
||||
*
|
||||
* @return HasMany
|
||||
@@ -389,7 +389,7 @@ class User extends Authenticatable
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* Link to piggy banks.
|
||||
*
|
||||
* @return HasManyThrough
|
||||
@@ -400,7 +400,7 @@ class User extends Authenticatable
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* Link to preferences.
|
||||
*
|
||||
* @return HasMany
|
||||
@@ -411,7 +411,7 @@ class User extends Authenticatable
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* Link to recurring transactions.
|
||||
*
|
||||
* @return HasMany
|
||||
@@ -462,7 +462,7 @@ class User extends Authenticatable
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* Link to roles.
|
||||
*
|
||||
* @return BelongsToMany
|
||||
@@ -497,7 +497,7 @@ class User extends Authenticatable
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* Link to rule groups.
|
||||
*
|
||||
* @return HasMany
|
||||
@@ -508,7 +508,7 @@ class User extends Authenticatable
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* Link to rules.
|
||||
*
|
||||
* @return HasMany
|
||||
@@ -519,7 +519,7 @@ class User extends Authenticatable
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* Send the password reset notification.
|
||||
*
|
||||
* @param string $token
|
||||
@@ -559,7 +559,7 @@ class User extends Authenticatable
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* Link to tags.
|
||||
*
|
||||
* @return HasMany
|
||||
@@ -570,7 +570,7 @@ class User extends Authenticatable
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* Link to transaction groups.
|
||||
*
|
||||
* @return HasMany
|
||||
@@ -581,7 +581,7 @@ class User extends Authenticatable
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* Link to transaction journals.
|
||||
*
|
||||
* @return HasMany
|
||||
@@ -592,7 +592,7 @@ class User extends Authenticatable
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* Link to transactions.
|
||||
*
|
||||
* @return HasManyThrough
|
||||
@@ -603,7 +603,7 @@ class User extends Authenticatable
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
* @return BelongsTo
|
||||
*/
|
||||
public function userGroup(): BelongsTo
|
||||
@@ -612,7 +612,7 @@ class User extends Authenticatable
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
|
||||
*
|
||||
* Link to webhooks
|
||||
*
|
||||
|
Reference in New Issue
Block a user