kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-06 22:21:42 +00:00
Code Issues Projects Releases Wiki Activity

Various code cleanup and fixed alignments.

Browse Source
This commit is contained in:
James Cole
2024-01-01 14:43:56 +01:00
parent 1368aafe5f
commit f963ac63f1
443 changed files with 3668 additions and 3672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Models/Account.php
View File

@@ -121,7 +121,7 @@ class Account extends Model
use SoftDeletes;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'user_id' => 'integer',
@@ -130,9 +130,9 @@ class Account extends Model
'encrypted' => 'boolean',
];
protected $fillable = ['user_id', 'user_group_id', 'account_type_id', 'name', 'active', 'virtual_balance', 'iban'];
protected $fillable = ['user_id', 'user_group_id', 'account_type_id', 'name', 'active', 'virtual_balance', 'iban'];
protected $hidden = ['encrypted'];
protected $hidden = ['encrypted'];
private bool $joinedAccountTypes = false;
/**
@@ -146,10 +146,10 @@ class Account extends Model
$accountId = (int)$value;
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
/** @var null|Account $account */
$account = $user->accounts()->with(['accountType'])->find($accountId);
$account = $user->accounts()->with(['accountType'])->find($accountId);
if (null !== $account) {
return $account;
}
@@ -240,7 +240,7 @@ class Account extends Model
public function setVirtualBalanceAttribute(mixed $value): void
{
$value = (string)$value;
$value = (string)$value;
if ('' === $value) {
$value = null;
}

4
app/Models/AccountMeta.php
View File

@@ -58,7 +58,7 @@ class AccountMeta extends Model
use ReturnsIntegerIdTrait;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
];
@@ -66,7 +66,7 @@ class AccountMeta extends Model
protected $fillable = ['account_id', 'name', 'data'];
/** @var string The table to store the data in */
protected $table = 'account_meta';
protected $table = 'account_meta';
public function account(): BelongsTo
{

4
app/Models/AccountType.php
View File

@@ -71,12 +71,12 @@ class AccountType extends Model
public const string REVENUE = 'Revenue account';
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
];
protected $fillable = ['type'];
protected $fillable = ['type'];
public function accounts(): HasMany
{

6
app/Models/Attachment.php
View File

@@ -96,7 +96,7 @@ class Attachment extends Model
use SoftDeletes;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
@@ -116,10 +116,10 @@ class Attachment extends Model
$attachmentId = (int)$value;
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
/** @var null|Attachment $attachment */
$attachment = $user->attachments()->find($attachmentId);
$attachment = $user->attachments()->find($attachmentId);
if (null !== $attachment) {
return $attachment;
}

2
app/Models/AutoBudget.php
View File

@@ -74,7 +74,7 @@ class AutoBudget extends Model
public const int AUTO_BUDGET_ADJUSTED = 3;
public const int AUTO_BUDGET_RESET = 1;
public const int AUTO_BUDGET_ROLLOVER = 2;
protected $fillable = ['budget_id', 'amount', 'period'];
protected $fillable = ['budget_id', 'amount', 'period'];
public function budget(): BelongsTo
{

6
app/Models/AvailableBudget.php
View File

@@ -79,7 +79,7 @@ class AvailableBudget extends Model
use SoftDeletes;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
@@ -101,10 +101,10 @@ class AvailableBudget extends Model
$availableBudgetId = (int)$value;
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
/** @var null|AvailableBudget $availableBudget */
$availableBudget = $user->availableBudgets()->find($availableBudgetId);
$availableBudget = $user->availableBudgets()->find($availableBudgetId);
if (null !== $availableBudget) {
return $availableBudget;
}

8
app/Models/Bill.php
View File

@@ -113,7 +113,7 @@ class Bill extends Model
use SoftDeletes;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
@@ -128,7 +128,7 @@ class Bill extends Model
];
protected $fillable
= [
= [
'name',
'match',
'amount_min',
@@ -158,10 +158,10 @@ class Bill extends Model
$billId = (int)$value;
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
/** @var null|Bill $bill */
$bill = $user->bills()->find($billId);
$bill = $user->bills()->find($billId);
if (null !== $bill) {
return $bill;
}

8
app/Models/Budget.php
View File

@@ -96,7 +96,7 @@ class Budget extends Model
use SoftDeletes;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
@@ -106,7 +106,7 @@ class Budget extends Model
protected $fillable = ['user_id', 'name', 'active', 'order', 'user_group_id'];
protected $hidden = ['encrypted'];
protected $hidden = ['encrypted'];
/**
* Route binder. Converts the key in the URL to the specified object (or throw 404).
@@ -119,10 +119,10 @@ class Budget extends Model
$budgetId = (int)$value;
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
/** @var null|Budget $budget */
$budget = $user->budgets()->find($budgetId);
$budget = $user->budgets()->find($budgetId);
if (null !== $budget) {
return $budget;
}

4
app/Models/BudgetLimit.php
View File

@@ -73,7 +73,7 @@ class BudgetLimit extends Model
use ReturnsIntegerIdTrait;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'start_date' => 'date',
@@ -81,7 +81,7 @@ class BudgetLimit extends Model
'auto_budget' => 'boolean',
];
protected $dispatchesEvents
= [
= [
'created' => Created::class,
'updated' => Updated::class,
'deleted' => Deleted::class,

8
app/Models/Category.php
View File

@@ -85,7 +85,7 @@ class Category extends Model
use SoftDeletes;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
@@ -94,7 +94,7 @@ class Category extends Model
protected $fillable = ['user_id', 'user_group_id', 'name'];
protected $hidden = ['encrypted'];
protected $hidden = ['encrypted'];
/**
* Route binder. Converts the key in the URL to the specified object (or throw 404).
@@ -107,10 +107,10 @@ class Category extends Model
$categoryId = (int)$value;
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
/** @var null|Category $category */
$category = $user->categories()->find($categoryId);
$category = $user->categories()->find($categoryId);
if (null !== $category) {
return $category;
}

2
app/Models/Configuration.php
View File

@@ -61,7 +61,7 @@ class Configuration extends Model
use SoftDeletes;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',

2
app/Models/InvitedUser.php
View File

@@ -84,7 +84,7 @@ class InvitedUser extends Model
$attemptId = (int)$value;
/** @var null|InvitedUser $attempt */
$attempt = self::find($attemptId);
$attempt = self::find($attemptId);
if (null !== $attempt) {
return $attempt;
}

2
app/Models/LinkType.php
View File

@@ -71,7 +71,7 @@ class LinkType extends Model
use SoftDeletes;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',

2
app/Models/Location.php
View File

@@ -70,7 +70,7 @@ class Location extends Model
use ReturnsIntegerIdTrait;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',

2
app/Models/Note.php
View File

@@ -68,7 +68,7 @@ class Note extends Model
use SoftDeletes;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',

2
app/Models/ObjectGroup.php
View File

@@ -97,7 +97,7 @@ class ObjectGroup extends Model
$objectGroupId = (int)$value;
/** @var null|ObjectGroup $objectGroup */
$objectGroup = self::where('object_groups.id', $objectGroupId)
$objectGroup = self::where('object_groups.id', $objectGroupId)
->where('object_groups.user_id', auth()->user()->id)->first()
;
if (null !== $objectGroup) {

4
app/Models/PiggyBank.php
View File

@@ -91,7 +91,7 @@ class PiggyBank extends Model
use SoftDeletes;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
@@ -104,7 +104,7 @@ class PiggyBank extends Model
protected $fillable = ['name', 'account_id', 'order', 'targetamount', 'startdate', 'targetdate', 'active'];
protected $hidden = ['targetamount_encrypted', 'encrypted'];
protected $hidden = ['targetamount_encrypted', 'encrypted'];
/**
* Route binder. Converts the key in the URL to the specified object (or throw 404).

4
app/Models/PiggyBankEvent.php
View File

@@ -62,7 +62,7 @@ class PiggyBankEvent extends Model
use ReturnsIntegerIdTrait;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'date' => 'date',
@@ -70,7 +70,7 @@ class PiggyBankEvent extends Model
protected $fillable = ['piggy_bank_id', 'transaction_journal_id', 'date', 'amount'];
protected $hidden = ['amount_encrypted'];
protected $hidden = ['amount_encrypted'];
public function piggyBank(): BelongsTo
{

2
app/Models/PiggyBankRepetition.php
View File

@@ -63,7 +63,7 @@ class PiggyBankRepetition extends Model
use ReturnsIntegerIdTrait;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'startdate' => 'date',

6
app/Models/Preference.php
View File

@@ -62,7 +62,7 @@ class Preference extends Model
use ReturnsIntegerUserIdTrait;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'data' => 'array',
@@ -79,7 +79,7 @@ class Preference extends Model
{
if (auth()->check()) {
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
/** @var null|Preference $preference */
$preference = $user->preferences()->where('name', $value)->first();
@@ -89,7 +89,7 @@ class Preference extends Model
if (null !== $preference) {
return $preference;
}
$default = config('firefly.default_preferences');
$default = config('firefly.default_preferences');
if (array_key_exists($value, $default)) {
$preference = new self();
$preference->name = $value;

8
app/Models/Recurrence.php
View File

@@ -103,7 +103,7 @@ class Recurrence extends Model
use SoftDeletes;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
@@ -119,7 +119,7 @@ class Recurrence extends Model
];
protected $fillable
= ['user_id', 'transaction_type_id', 'title', 'description', 'first_date', 'repeat_until', 'latest_date', 'repetitions', 'apply_rules', 'active'];
= ['user_id', 'transaction_type_id', 'title', 'description', 'first_date', 'repeat_until', 'latest_date', 'repetitions', 'apply_rules', 'active'];
/** @var string The table to store the data in */
protected $table = 'recurrences';
@@ -135,10 +135,10 @@ class Recurrence extends Model
$recurrenceId = (int)$value;
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
/** @var null|Recurrence $recurrence */
$recurrence = $user->recurrences()->find($recurrenceId);
$recurrence = $user->recurrences()->find($recurrenceId);
if (null !== $recurrence) {
return $recurrence;
}

4
app/Models/RecurrenceMeta.php
View File

@@ -66,7 +66,7 @@ class RecurrenceMeta extends Model
use SoftDeletes;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
@@ -77,7 +77,7 @@ class RecurrenceMeta extends Model
protected $fillable = ['recurrence_id', 'name', 'value'];
/** @var string The table to store the data in */
protected $table = 'recurrences_meta';
protected $table = 'recurrences_meta';
public function recurrence(): BelongsTo
{

6
app/Models/RecurrenceRepetition.php
View File

@@ -75,7 +75,7 @@ class RecurrenceRepetition extends Model
public const int WEEKEND_TO_MONDAY = 4;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
@@ -85,10 +85,10 @@ class RecurrenceRepetition extends Model
'weekend' => 'int',
];
protected $fillable = ['recurrence_id', 'weekend', 'repetition_type', 'repetition_moment', 'repetition_skip'];
protected $fillable = ['recurrence_id', 'weekend', 'repetition_type', 'repetition_moment', 'repetition_skip'];
/** @var string The table to store the data in */
protected $table = 'recurrences_repetitions';
protected $table = 'recurrences_repetitions';
public function recurrence(): BelongsTo
{

4
app/Models/RecurrenceTransaction.php
View File

@@ -90,7 +90,7 @@ class RecurrenceTransaction extends Model
use SoftDeletes;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
@@ -100,7 +100,7 @@ class RecurrenceTransaction extends Model
];
protected $fillable
= [
= [
'recurrence_id',
'transaction_currency_id',
'foreign_currency_id',

4
app/Models/RecurrenceTransactionMeta.php
View File

@@ -66,7 +66,7 @@ class RecurrenceTransactionMeta extends Model
use SoftDeletes;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
@@ -77,7 +77,7 @@ class RecurrenceTransactionMeta extends Model
protected $fillable = ['rt_id', 'name', 'value'];
/** @var string The table to store the data in */
protected $table = 'rt_meta';
protected $table = 'rt_meta';
public function recurrenceTransaction(): BelongsTo
{

2
app/Models/Role.php
View File

@@ -61,7 +61,7 @@ class Role extends Model
use ReturnsIntegerIdTrait;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
];

6
app/Models/Rule.php
View File

@@ -94,7 +94,7 @@ class Rule extends Model
use SoftDeletes;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
@@ -118,10 +118,10 @@ class Rule extends Model
$ruleId = (int)$value;
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
/** @var null|Rule $rule */
$rule = $user->rules()->find($ruleId);
$rule = $user->rules()->find($ruleId);
if (null !== $rule) {
return $rule;
}

2
app/Models/RuleAction.php
View File

@@ -65,7 +65,7 @@ class RuleAction extends Model
use ReturnsIntegerIdTrait;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'active' => 'boolean',

6
app/Models/RuleGroup.php
View File

@@ -84,7 +84,7 @@ class RuleGroup extends Model
use SoftDeletes;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
@@ -106,10 +106,10 @@ class RuleGroup extends Model
$ruleGroupId = (int)$value;
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
/** @var null|RuleGroup $ruleGroup */
$ruleGroup = $user->ruleGroups()->find($ruleGroupId);
$ruleGroup = $user->ruleGroups()->find($ruleGroupId);
if (null !== $ruleGroup) {
return $ruleGroup;
}

2
app/Models/RuleTrigger.php
View File

@@ -65,7 +65,7 @@ class RuleTrigger extends Model
use ReturnsIntegerIdTrait;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'active' => 'boolean',

8
app/Models/Tag.php
View File

@@ -92,7 +92,7 @@ class Tag extends Model
use SoftDeletes;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
@@ -104,7 +104,7 @@ class Tag extends Model
protected $fillable = ['user_id', 'user_group_id', 'tag', 'date', 'description', 'tagMode'];
protected $hidden = ['zoomLevel', 'latitude', 'longitude'];
protected $hidden = ['zoomLevel', 'latitude', 'longitude'];
/**
* Route binder. Converts the key in the URL to the specified object (or throw 404).
@@ -117,10 +117,10 @@ class Tag extends Model
$tagId = (int)$value;
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
/** @var null|Tag $tag */
$tag = $user->tags()->find($tagId);
$tag = $user->tags()->find($tagId);
if (null !== $tag) {
return $tag;
}

4
app/Models/Transaction.php
View File

@@ -98,7 +98,7 @@ class Transaction extends Model
use SoftDeletes;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
@@ -109,7 +109,7 @@ class Transaction extends Model
];
protected $fillable
= [
= [
'account_id',
'transaction_journal_id',
'description',

2
app/Models/TransactionCurrency.php
View File

@@ -88,7 +88,7 @@ class TransactionCurrency extends Model
public ?bool $userGroupDefault;
public ?bool $userGroupEnabled;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',

6
app/Models/TransactionGroup.php
View File

@@ -77,7 +77,7 @@ class TransactionGroup extends Model
use SoftDeletes;
protected $casts
= [
= [
'id' => 'integer',
'created_at' => 'datetime',
'updated_at' => 'datetime',
@@ -100,11 +100,11 @@ class TransactionGroup extends Model
$groupId = (int)$value;
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
app('log')->debug(sprintf('User authenticated as %s', $user->email));
/** @var null|TransactionGroup $group */
$group = $user->transactionGroups()
$group = $user->transactionGroups()
->with(['transactionJournals', 'transactionJournals.transactions'])
->where('transaction_groups.id', $groupId)->first(['transaction_groups.*'])
;

8
app/Models/TransactionJournal.php
View File

@@ -137,7 +137,7 @@ class TransactionJournal extends Model
use SoftDeletes;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
@@ -152,7 +152,7 @@ class TransactionJournal extends Model
];
protected $fillable
= [
= [
'user_id',
'user_group_id',
'transaction_type_id',
@@ -178,10 +178,10 @@ class TransactionJournal extends Model
$journalId = (int)$value;
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
/** @var null|TransactionJournal $journal */
$journal = $user->transactionJournals()->where('transaction_journals.id', $journalId)->first(['transaction_journals.*']);
$journal = $user->transactionJournals()->where('transaction_journals.id', $journalId)->first(['transaction_journals.*']);
if (null !== $journal) {
return $journal;
}

2
app/Models/TransactionJournalLink.php
View File

@@ -70,7 +70,7 @@ class TransactionJournalLink extends Model
use ReturnsIntegerIdTrait;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
];

4
app/Models/TransactionJournalMeta.php
View File

@@ -68,7 +68,7 @@ class TransactionJournalMeta extends Model
use SoftDeletes;
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
@@ -77,7 +77,7 @@ class TransactionJournalMeta extends Model
protected $fillable = ['transaction_journal_id', 'name', 'data', 'hash'];
/** @var string The table to store the data in */
protected $table = 'journal_meta';
protected $table = 'journal_meta';
/**
* @param mixed $value

4
app/Models/TransactionType.php
View File

@@ -72,12 +72,12 @@ class TransactionType extends Model
public const string WITHDRAWAL = 'Withdrawal';
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
];
protected $fillable = ['type'];
protected $fillable = ['type'];
/**
* Route binder. Converts the key in the URL to the specified object (or throw 404).

6
app/Models/UserGroup.php
View File

@@ -111,16 +111,16 @@ class UserGroup extends Model
$userGroupId = (int)$value;
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
/** @var null|UserGroup $userGroup */
$userGroup = self::find($userGroupId);
$userGroup = self::find($userGroupId);
if (null === $userGroup) {
throw new NotFoundHttpException();
}
// need at least ready only to be aware of the user group's existence,
// but owner/full role (in the group) or global owner role may overrule this.
$access = $user->hasRoleInGroupOrOwner($userGroup, UserRoleEnum::READ_ONLY) || $user->hasRole('owner');
$access = $user->hasRoleInGroupOrOwner($userGroup, UserRoleEnum::READ_ONLY) || $user->hasRole('owner');
if ($access) {
return $userGroup;
}

4
app/Models/Webhook.php
View File

@@ -180,10 +180,10 @@ class Webhook extends Model
$webhookId = (int)$value;
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
/** @var null|Webhook $webhook */
$webhook = $user->webhooks()->find($webhookId);
$webhook = $user->webhooks()->find($webhookId);
if (null !== $webhook) {
return $webhook;
}

4
app/Models/WebhookAttempt.php
View File

@@ -80,10 +80,10 @@ class WebhookAttempt extends Model
$attemptId = (int)$value;
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
/** @var null|WebhookAttempt $attempt */
$attempt = self::find($attemptId);
$attempt = self::find($attemptId);
if (null !== $attempt && $attempt->webhookMessage->webhook->user_id === $user->id) {
return $attempt;
}

4
app/Models/WebhookMessage.php
View File

@@ -95,10 +95,10 @@ class WebhookMessage extends Model
$messageId = (int)$value;
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
/** @var null|WebhookMessage $message */
$message = self::find($messageId);
$message = self::find($messageId);
if (null !== $message && $message->webhook->user_id === $user->id) {
return $message;
}