kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-12 09:52:20 +00:00
Code Issues Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
James Cole
2024-12-22 08:43:12 +01:00
parent 5751f7e5a3
commit 565bd87959
574 changed files with 4600 additions and 4604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/TransactionRules/Actions/AppendDescriptionToNotes.php
View File

@@ -57,7 +57,7 @@ class AppendDescriptionToNotes implements ActionInterface
$object = TransactionJournal::where('user_id', $journal['user_id'])->find($journal['transaction_journal_id']);
if (null === $object) {
app('log')->error(sprintf('No journal #%d belongs to user #%d.', $journal['transaction_journal_id'], $journal['user_id']));
event(new RuleActionFailedOnArray($this->action, $journal, (string)trans('rules.journal_other_user')));
event(new RuleActionFailedOnArray($this->action, $journal, (string) trans('rules.journal_other_user')));
return false;
}
@@ -72,7 +72,7 @@ class AppendDescriptionToNotes implements ActionInterface
$note->text = trim(sprintf("%s \n%s", $note->text, $object->description));
}
if ('' === $note->text) {
$note->text = (string)$object->description;
$note->text = (string) $object->description;
}
$after = $note->text;

4
app/TransactionRules/Actions/AppendNotes.php
View File

@@ -50,13 +50,13 @@ class AppendNotes implements ActionInterface
public function actOnArray(array $journal): bool
{
$this->refreshNotes($journal);
$dbNote = Note::where('noteable_id', (int)$journal['transaction_journal_id'])
$dbNote = Note::where('noteable_id', (int) $journal['transaction_journal_id'])
->where('noteable_type', TransactionJournal::class)
->first(['notes.*'])
;
if (null === $dbNote) {
$dbNote = new Note();
$dbNote->noteable_id = (int)$journal['transaction_journal_id'];
$dbNote->noteable_id = (int) $journal['transaction_journal_id'];
$dbNote->noteable_type = TransactionJournal::class;
$dbNote->text = '';
}

2
app/TransactionRules/Actions/AppendNotesToDescription.php
View File

@@ -74,7 +74,7 @@ class AppendNotesToDescription implements ActionInterface
// only append if there is something to append
if ('' !== $note->text) {
$before = $object->description;
$object->description = trim(sprintf('%s %s', $object->description, (string)$this->clearString($note->text)));
$object->description = trim(sprintf('%s %s', $object->description, (string) $this->clearString($note->text)));
$object->save();
app('log')->debug(sprintf('Journal description is updated to "%s".', $object->description));

4
app/TransactionRules/Actions/ConvertToTransfer.php
View File

@@ -169,7 +169,7 @@ class ConvertToTransfer implements ActionInterface
return '';
}
return (string)$journal->transactions()->where('amount', '<', 0)->first()?->account?->accountType?->type;
return (string) $journal->transactions()->where('amount', '<', 0)->first()?->account?->accountType?->type;
}
private function getDestinationType(int $journalId): string
@@ -182,7 +182,7 @@ class ConvertToTransfer implements ActionInterface
return '';
}
return (string)$journal->transactions()->where('amount', '>', 0)->first()?->account?->accountType?->type;
return (string) $journal->transactions()->where('amount', '>', 0)->first()?->account?->accountType?->type;
}
/**

2
app/TransactionRules/Actions/MoveDescriptionToNotes.php
View File

@@ -71,7 +71,7 @@ class MoveDescriptionToNotes implements ActionInterface
$object->description = '(no description)';
}
if ('' === $note->text) {
$note->text = (string)$object->description;
$note->text = (string) $object->description;
$object->description = '(no description)';
}
$after = $note->text;

2
app/TransactionRules/Actions/MoveNotesToDescription.php
View File

@@ -78,7 +78,7 @@ class MoveNotesToDescription implements ActionInterface
}
$before = $object->description;
$beforeNote = $note->text;
$object->description = (string)$this->clearString($note->text);
$object->description = (string) $this->clearString($note->text);
$object->save();
$note->delete();

4
app/TransactionRules/Actions/PrependNotes.php
View File

@@ -46,13 +46,13 @@ class PrependNotes implements ActionInterface
public function actOnArray(array $journal): bool
{
$dbNote = Note::where('noteable_id', (int)$journal['transaction_journal_id'])
$dbNote = Note::where('noteable_id', (int) $journal['transaction_journal_id'])
->where('noteable_type', TransactionJournal::class)
->first(['notes.*'])
;
if (null === $dbNote) {
$dbNote = new Note();
$dbNote->noteable_id = (int)$journal['transaction_journal_id'];
$dbNote->noteable_id = (int) $journal['transaction_journal_id'];
$dbNote->noteable_type = TransactionJournal::class;
$dbNote->text = '';
}

2
app/TransactionRules/Actions/SetBudget.php
View File

@@ -84,7 +84,7 @@ class SetBudget implements ActionInterface
$object = $user->transactionJournals()->find($journal['transaction_journal_id']);
$oldBudget = $object->budgets()->first();
$oldBudgetName = $oldBudget?->name;
if ((int)$oldBudget?->id === $budget->id) {
if ((int) $oldBudget?->id === $budget->id) {
event(new RuleActionFailedOnArray($this->action, $journal, trans('rules.already_linked_to_budget', ['name' => $budget->name])));
return false;

2
app/TransactionRules/Actions/SetCategory.php
View File

@@ -88,7 +88,7 @@ class SetCategory implements ActionInterface
$object = $user->transactionJournals()->find($journal['transaction_journal_id']);
$oldCategory = $object->categories()->first();
$oldCategoryName = $oldCategory?->name;
if ((int)$oldCategory?->id === $category->id) {
if ((int) $oldCategory?->id === $category->id) {
// event(new RuleActionFailedOnArray($this->action, $journal, trans('rules.already_linked_to_category', ['name' => $category->name])));
return false;

2
app/TransactionRules/Actions/SetDestinationAccount.php
View File

@@ -57,7 +57,7 @@ class SetDestinationAccount implements ActionInterface
$user = User::find($journal['user_id']);
/** @var null|TransactionJournal $object */
$object = $user->transactionJournals()->find((int)$journal['transaction_journal_id']);
$object = $user->transactionJournals()->find((int) $journal['transaction_journal_id']);
$this->repository = app(AccountRepositoryInterface::class);
if (null === $object) {

2
app/TransactionRules/Actions/SetDestinationToCashAccount.php
View File

@@ -54,7 +54,7 @@ class SetDestinationToCashAccount implements ActionInterface
$user = User::find($journal['user_id']);
/** @var null|TransactionJournal $object */
$object = $user->transactionJournals()->find((int)$journal['transaction_journal_id']);
$object = $user->transactionJournals()->find((int) $journal['transaction_journal_id']);
$repository = app(AccountRepositoryInterface::class);
if (null === $object) {

2
app/TransactionRules/Actions/SetSourceAccount.php
View File

@@ -57,7 +57,7 @@ class SetSourceAccount implements ActionInterface
$user = User::find($journal['user_id']);
/** @var null|TransactionJournal $object */
$object = $user->transactionJournals()->find((int)$journal['transaction_journal_id']);
$object = $user->transactionJournals()->find((int) $journal['transaction_journal_id']);
$this->repository = app(AccountRepositoryInterface::class);
if (null === $object) {
app('log')->error('Could not find journal.');

2
app/TransactionRules/Actions/SetSourceToCashAccount.php
View File

@@ -54,7 +54,7 @@ class SetSourceToCashAccount implements ActionInterface
$user = User::find($journal['user_id']);
/** @var null|TransactionJournal $object */
$object = $user->transactionJournals()->find((int)$journal['transaction_journal_id']);
$object = $user->transactionJournals()->find((int) $journal['transaction_journal_id']);
$repository = app(AccountRepositoryInterface::class);
if (null === $object) {

10
app/TransactionRules/Actions/UpdatePiggybank.php
View File

@@ -114,11 +114,11 @@ class UpdatePiggybank implements ActionInterface
'add_to_piggy',
null,
[
'currency_symbol' => $journalObj->transactionCurrency->symbol,
'decimal_places' => $journalObj->transactionCurrency->decimal_places,
'amount' => $destination->amount,
'piggy' => $piggyBank->name,
'piggy_id' => $piggyBank->id,
'currency_symbol' => $journalObj->transactionCurrency->symbol,
'decimal_places' => $journalObj->transactionCurrency->decimal_places,
'amount' => $destination->amount,
'piggy' => $piggyBank->name,
'piggy_id' => $piggyBank->id,
]
)
);