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

Use PSR-12 code style

Browse Source
This commit is contained in:
James Cole
2022-10-30 12:24:51 +01:00
parent bdcd9825ec
commit b27fe59ab4
44 changed files with 414 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Console\Commands\Correction;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\Transaction;
@@ -63,8 +64,8 @@ class CorrectOpeningBalanceCurrencies extends Command
Log::debug(sprintf('Now in %s', __METHOD__));
// get all OB journals:
$set = TransactionJournal::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
->whereNull('transaction_journals.deleted_at')
->where('transaction_types.type', TransactionType::OPENING_BALANCE)->get(['transaction_journals.*']);
->whereNull('transaction_journals.deleted_at')
->where('transaction_types.type', TransactionType::OPENING_BALANCE)->get(['transaction_journals.*']);
$this->line(sprintf('Going to verify %d opening balance transactions.', $set->count()));
$count = 0;
@@ -90,7 +91,7 @@ class CorrectOpeningBalanceCurrencies extends Command
}
/**
* @param TransactionJournal $journal
* @param TransactionJournal $journal
*
* @return int
*/
@@ -112,7 +113,7 @@ class CorrectOpeningBalanceCurrencies extends Command
}
/**
* @param TransactionJournal $journal
* @param TransactionJournal $journal
*
* @return Account|null
*/
@@ -131,11 +132,11 @@ class CorrectOpeningBalanceCurrencies extends Command
}
/**
* @param Account $account
* @param Account $account
*
* @return TransactionCurrency
* @throws JsonException
* @throws \FireflyIII\Exceptions\FireflyException
* @throws FireflyException
*/
private function getCurrency(Account $account): TransactionCurrency
{
@@ -147,15 +148,15 @@ class CorrectOpeningBalanceCurrencies extends Command
}
/**
* @param TransactionJournal $journal
* @param TransactionCurrency $currency
* @param TransactionJournal $journal
* @param TransactionCurrency $currency
*
* @return int
*/
private function setCurrency(TransactionJournal $journal, TransactionCurrency $currency): int
{
$count = 0;
if ((int) $journal->transaction_currency_id !== (int) $currency->id) {
if ((int)$journal->transaction_currency_id !== (int)$currency->id) {
$journal->transaction_currency_id = $currency->id;
$journal->save();
$count = 1;
@@ -163,7 +164,7 @@ class CorrectOpeningBalanceCurrencies extends Command
/** @var Transaction $transaction */
foreach ($journal->transactions as $transaction) {
if ((int) $transaction->transaction_currency_id !== (int) $currency->id) {
if ((int)$transaction->transaction_currency_id !== (int)$currency->id) {
$transaction->transaction_currency_id = $currency->id;
$transaction->save();
$count = 1;

2
app/Console/Commands/Correction/DeleteEmptyGroups.php
View File

@@ -59,7 +59,7 @@ class DeleteEmptyGroups extends Command
$start = microtime(true);
$groupIds
= TransactionGroup::leftJoin('transaction_journals', 'transaction_groups.id', '=', 'transaction_journals.transaction_group_id')
->whereNull('transaction_journals.id')->get(['transaction_groups.id'])->pluck('id')->toArray();
->whereNull('transaction_journals.id')->get(['transaction_groups.id'])->pluck('id')->toArray();
$total = count($groupIds);
Log::debug(sprintf('Count is %d', $total));

10
app/Console/Commands/Correction/DeleteEmptyJournals.php
View File

@@ -67,22 +67,22 @@ class DeleteEmptyJournals extends Command
private function deleteUnevenJournals(): void
{
$set = Transaction::whereNull('deleted_at')
->groupBy('transactions.transaction_journal_id')
->get([DB::raw('COUNT(transactions.transaction_journal_id) as the_count'), 'transaction_journal_id']);
->groupBy('transactions.transaction_journal_id')
->get([DB::raw('COUNT(transactions.transaction_journal_id) as the_count'), 'transaction_journal_id']);
$total = 0;
/** @var Transaction $row */
foreach ($set as $row) {
$count = (int) $row->the_count;
$count = (int)$row->the_count;
if (1 === $count % 2) {
// uneven number, delete journal and transactions:
try {
TransactionJournal::find((int) $row->transaction_journal_id)->delete();
TransactionJournal::find((int)$row->transaction_journal_id)->delete();
} catch (Exception $e) { // @phpstan-ignore-line
Log::info(sprintf('Could not delete journal: %s', $e->getMessage()));
}
Transaction::where('transaction_journal_id', (int) $row->transaction_journal_id)->delete();
Transaction::where('transaction_journal_id', (int)$row->transaction_journal_id)->delete();
$this->info(sprintf('Deleted transaction journal #%d because it had an uneven number of transactions.', $row->transaction_journal_id));
$total++;
}

84
app/Console/Commands/Correction/DeleteOrphanedTransactions.php
View File

@@ -66,6 +66,34 @@ class DeleteOrphanedTransactions extends Command
return 0;
}
private function deleteOrphanedJournals(): void
{
$set = TransactionJournal::leftJoin('transaction_groups', 'transaction_journals.transaction_group_id', 'transaction_groups.id')
->whereNotNull('transaction_groups.deleted_at')
->whereNull('transaction_journals.deleted_at')
->get(['transaction_journals.id', 'transaction_journals.transaction_group_id']);
$count = $set->count();
if (0 === $count) {
$this->info('No orphaned journals.');
}
if ($count > 0) {
$this->info(sprintf('Found %d orphaned journal(s).', $count));
foreach ($set as $entry) {
$journal = TransactionJournal::withTrashed()->find((int)$entry->id);
if (null !== $journal) {
$journal->delete();
$this->info(
sprintf(
'Journal #%d (part of deleted transaction group #%d) has been deleted as well.',
$entry->id,
$entry->transaction_group_id
)
);
}
}
}
}
/**
* @throws Exception
*/
@@ -73,18 +101,18 @@ class DeleteOrphanedTransactions extends Command
{
$count = 0;
$set = Transaction::leftJoin('transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->whereNotNull('transaction_journals.deleted_at')
->whereNull('transactions.deleted_at')
->whereNotNull('transactions.id')
->get(
[
'transaction_journals.id as journal_id',
'transactions.id as transaction_id',
]
);
->whereNotNull('transaction_journals.deleted_at')
->whereNull('transactions.deleted_at')
->whereNotNull('transactions.id')
->get(
[
'transaction_journals.id as journal_id',
'transactions.id as transaction_id',
]
);
/** @var stdClass $entry */
foreach ($set as $entry) {
$transaction = Transaction::find((int) $entry->transaction_id);
$transaction = Transaction::find((int)$entry->transaction_id);
if (null !== $transaction) {
$transaction->delete();
$this->info(
@@ -109,13 +137,13 @@ class DeleteOrphanedTransactions extends Command
{
$set
= Transaction::leftJoin('accounts', 'transactions.account_id', '=', 'accounts.id')
->whereNotNull('accounts.deleted_at')
->get(['transactions.*']);
->whereNotNull('accounts.deleted_at')
->get(['transactions.*']);
$count = 0;
/** @var Transaction $transaction */
foreach ($set as $transaction) {
// delete journals
$journal = TransactionJournal::find((int) $transaction->transaction_journal_id);
$journal = TransactionJournal::find((int)$transaction->transaction_journal_id);
if ($journal) {
try {
$journal->delete();
@@ -123,7 +151,7 @@ class DeleteOrphanedTransactions extends Command
Log::info(sprintf('Could not delete journal %s', $e->getMessage()));
}
}
Transaction::where('transaction_journal_id', (int) $transaction->transaction_journal_id)->delete();
Transaction::where('transaction_journal_id', (int)$transaction->transaction_journal_id)->delete();
$this->line(
sprintf(
'Deleted transaction journal #%d because account #%d was already deleted.',
@@ -137,32 +165,4 @@ class DeleteOrphanedTransactions extends Command
$this->info('No orphaned accounts.');
}
}
private function deleteOrphanedJournals(): void
{
$set = TransactionJournal::leftJoin('transaction_groups', 'transaction_journals.transaction_group_id', 'transaction_groups.id')
->whereNotNull('transaction_groups.deleted_at')
->whereNull('transaction_journals.deleted_at')
->get(['transaction_journals.id', 'transaction_journals.transaction_group_id']);
$count = $set->count();
if (0 === $count) {
$this->info('No orphaned journals.');
}
if ($count > 0) {
$this->info(sprintf('Found %d orphaned journal(s).', $count));
foreach ($set as $entry) {
$journal = TransactionJournal::withTrashed()->find((int) $entry->id);
if (null !== $journal) {
$journal->delete();
$this->info(
sprintf(
'Journal #%d (part of deleted transaction group #%d) has been deleted as well.',
$entry->id,
$entry->transaction_group_id
)
);
}
}
}
}
}

10
app/Console/Commands/Correction/EnableCurrencies.php
View File

@@ -63,26 +63,26 @@ class EnableCurrencies extends Command
/** @var Collection $meta */
$meta = AccountMeta::where('name', 'currency_id')->groupBy('data')->get(['data']);
foreach ($meta as $entry) {
$found[] = (int) $entry->data;
$found[] = (int)$entry->data;
}
// get all from journals:
$journals = TransactionJournal::groupBy('transaction_currency_id')->get(['transaction_currency_id']);
foreach ($journals as $entry) {
$found[] = (int) $entry->transaction_currency_id;
$found[] = (int)$entry->transaction_currency_id;
}
// get all from transactions
$transactions = Transaction::groupBy('transaction_currency_id', 'foreign_currency_id')->get(['transaction_currency_id', 'foreign_currency_id']);
foreach ($transactions as $entry) {
$found[] = (int) $entry->transaction_currency_id;
$found[] = (int) $entry->foreign_currency_id;
$found[] = (int)$entry->transaction_currency_id;
$found[] = (int)$entry->foreign_currency_id;
}
// get all from budget limits
$limits = BudgetLimit::groupBy('transaction_currency_id')->get(['transaction_currency_id']);
foreach ($limits as $entry) {
$found[] = (int) $entry->transaction_currency_id;
$found[] = (int)$entry->transaction_currency_id;
}
$found = array_values(array_unique($found));

14
app/Console/Commands/Correction/FixAccountTypes.php
View File

@@ -99,7 +99,7 @@ class FixAccountTypes extends Command
}
/**
* @param TransactionJournal $journal
* @param TransactionJournal $journal
*
* @throws FireflyException
*/
@@ -140,7 +140,7 @@ class FixAccountTypes extends Command
}
/**
* @param TransactionJournal $journal
* @param TransactionJournal $journal
*
* @return Transaction
*/
@@ -150,7 +150,7 @@ class FixAccountTypes extends Command
}
/**
* @param TransactionJournal $journal
* @param TransactionJournal $journal
*
* @return Transaction
*/
@@ -160,10 +160,10 @@ class FixAccountTypes extends Command
}
/**
* @param TransactionJournal $journal
* @param string $type
* @param Transaction $source
* @param Transaction $dest
* @param TransactionJournal $journal
* @param string $type
* @param Transaction $source
* @param Transaction $dest
*
* @throws FireflyException
*/

4
app/Console/Commands/Correction/FixFrontpageAccounts.php
View File

@@ -73,7 +73,7 @@ class FixFrontpageAccounts extends Command
}
/**
* @param Preference $preference
* @param Preference $preference
*/
private function fixPreference(Preference $preference): void
{
@@ -88,7 +88,7 @@ class FixFrontpageAccounts extends Command
if (is_array($data)) {
/** @var string $accountId */
foreach ($data as $accountId) {
$accountIdInt = (int) $accountId;
$accountIdInt = (int)$accountId;
$account = $repository->find($accountIdInt);
if (null !== $account
&& in_array($account->accountType->type, [AccountType::ASSET, AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE], true)

6
app/Console/Commands/Correction/FixGroupAccounts.php
View File

@@ -58,11 +58,11 @@ class FixGroupAccounts extends Command
{
$groups = [];
$res = TransactionJournal::groupBy('transaction_group_id')
->get(['transaction_group_id', DB::raw('COUNT(transaction_group_id) as the_count')]);
->get(['transaction_group_id', DB::raw('COUNT(transaction_group_id) as the_count')]);
/** @var TransactionJournal $journal */
foreach ($res as $journal) {
if ((int) $journal->the_count > 1) {
$groups[] = (int) $journal->transaction_group_id;
if ((int)$journal->the_count > 1) {
$groups[] = (int)$journal->transaction_group_id;
}
}
$handler = new UpdatedGroupEventHandler();

2
app/Console/Commands/Correction/FixIbans.php
View File

@@ -57,7 +57,7 @@ class FixIbans extends Command
foreach ($accounts as $account) {
$iban = $account->iban;
if (str_contains($iban, ' ')) {
$iban = app('steam')->filterSpaces((string) $account->iban);
$iban = app('steam')->filterSpaces((string)$account->iban);
if ('' !== $iban) {
$account->iban = $iban;
$account->save();

2
app/Console/Commands/Correction/FixLongDescriptions.php
View File

@@ -68,7 +68,7 @@ class FixLongDescriptions extends Command
$groups = TransactionGroup::get(['id', 'title']);
/** @var TransactionGroup $group */
foreach ($groups as $group) {
if (strlen((string) $group->title) > self::MAX_LENGTH) {
if (strlen((string)$group->title) > self::MAX_LENGTH) {
$group->title = substr($group->title, 0, self::MAX_LENGTH);
$group->save();
$this->line(sprintf('Truncated description of transaction group #%d', $group->id));

8
app/Console/Commands/Correction/FixRecurringTransactions.php
View File

@@ -96,7 +96,7 @@ class FixRecurringTransactions extends Command
}
/**
* @param User $user
* @param User $user
*/
private function processUser(User $user): void
{
@@ -109,7 +109,7 @@ class FixRecurringTransactions extends Command
}
/**
* @param Recurrence $recurrence
* @param Recurrence $recurrence
*/
private function processRecurrence(Recurrence $recurrence): void
{
@@ -120,8 +120,8 @@ class FixRecurringTransactions extends Command
}
/**
* @param Recurrence $recurrence
* @param RecurrenceTransaction $transaction
* @param Recurrence $recurrence
* @param RecurrenceTransaction $transaction
*/
private function processTransaction(Recurrence $recurrence, RecurrenceTransaction $transaction): void
{

14
app/Console/Commands/Correction/FixTransactionTypes.php
View File

@@ -86,11 +86,11 @@ class FixTransactionTypes extends Command
private function collectJournals(): Collection
{
return TransactionJournal::with(['transactionType', 'transactions', 'transactions.account', 'transactions.account.accountType'])
->get();
->get();
}
/**
* @param TransactionJournal $journal
* @param TransactionJournal $journal
*
* @return bool
*/
@@ -105,7 +105,7 @@ class FixTransactionTypes extends Command
return false;
}
$expectedType = (string) config(sprintf('firefly.account_to_transaction.%s.%s', $source->accountType->type, $destination->accountType->type));
$expectedType = (string)config(sprintf('firefly.account_to_transaction.%s.%s', $source->accountType->type, $destination->accountType->type));
if ($expectedType !== $type) {
$this->line(
sprintf(
@@ -126,7 +126,7 @@ class FixTransactionTypes extends Command
}
/**
* @param TransactionJournal $journal
* @param TransactionJournal $journal
*
* @return Account
* @throws FireflyException
@@ -155,7 +155,7 @@ class FixTransactionTypes extends Command
}
/**
* @param TransactionJournal $journal
* @param TransactionJournal $journal
*
* @return Account
* @throws FireflyException
@@ -184,8 +184,8 @@ class FixTransactionTypes extends Command
}
/**
* @param TransactionJournal $journal
* @param string $expectedType
* @param TransactionJournal $journal
* @param string $expectedType
*/
private function changeJournal(TransactionJournal $journal, string $expectedType): void
{

8
app/Console/Commands/Correction/FixUnevenAmount.php
View File

@@ -65,11 +65,11 @@ class FixUnevenAmount extends Command
->get(['transaction_journal_id', DB::raw('SUM(amount) AS the_sum')]);
/** @var stdClass $entry */
foreach ($journals as $entry) {
if (0 !== bccomp((string) $entry->the_sum, '0')) {
if (0 !== bccomp((string)$entry->the_sum, '0')) {
$message = sprintf('Sum of journal #%d is %s instead of zero.', $entry->transaction_journal_id, $entry->the_sum);
$this->warn($message);
Log::warning($message);
$this->fixJournal((int) $entry->transaction_journal_id);
$this->fixJournal((int)$entry->transaction_journal_id);
$count++;
}
}
@@ -84,7 +84,7 @@ class FixUnevenAmount extends Command
}
/**
* @param int $param
* @param int $param
*/
private function fixJournal(int $param): void
{
@@ -110,7 +110,7 @@ class FixUnevenAmount extends Command
return;
}
$amount = bcmul('-1', (string) $source->amount);
$amount = bcmul('-1', (string)$source->amount);
// fix amount of destination:
/** @var Transaction $destination */

4
app/Console/Commands/Correction/RenameMetaFields.php
View File

@@ -87,8 +87,8 @@ class RenameMetaFields extends Command
}
/**
* @param string $original
* @param string $update
* @param string $original
* @param string $update
*/
private function rename(string $original, string $update): void
{