IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Do some code cleanup.

Browse Source
This commit is contained in:
James Cole
2020-03-15 08:16:16 +01:00
parent f63e51fea2
commit 6967bb003e
43 changed files with 139 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,15 +111,12 @@ class CorrectOpeningBalanceCurrencies extends Command
*/
private function getAccount(TransactionJournal $journal): ?Account
{
$excluded = [];
$transactions = $journal->transactions()->with(['account', 'account.accountType'])->get();
/** @var Transaction $transaction */
foreach ($transactions as $transaction) {
$account = $transaction->account;
if (null !== $account) {
if (AccountType::INITIAL_BALANCE !== $account->accountType->type) {
return $account;
}
if ((null !== $account) && AccountType::INITIAL_BALANCE !== $account->accountType->type) {
return $account;
}
}

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

@@ -25,7 +25,6 @@ namespace FireflyIII\Console\Commands\Correction;
use Exception;
use FireflyIII\Models\TransactionGroup;
use FireflyIII\Models\TransactionJournal;
use Illuminate\Console\Command;
use Log;
@@ -59,7 +58,7 @@ class DeleteEmptyGroups extends Command
$start = microtime(true);
$groupIds =
TransactionGroup
::leftJoin('transaction_journals','transaction_groups.id','=','transaction_journals.transaction_group_id')
::leftJoin('transaction_journals', 'transaction_groups.id', '=', 'transaction_journals.transaction_group_id')
->whereNull('transaction_journals.id')->get(['transaction_groups.id'])->pluck('id')->toArray();
$total = count($groupIds);

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

@@ -91,8 +91,11 @@ class DeleteOrphanedTransactions extends Command
}
Transaction::where('transaction_journal_id', (int)$transaction->transaction_journal_id)->delete();
$this->line(
sprintf('Deleted transaction journal #%d because account #%d was already deleted.',
$transaction->transaction_journal_id, $transaction->account_id)
sprintf(
'Deleted transaction journal #%d because account #%d was already deleted.',
$transaction->transaction_journal_id,
$transaction->account_id
)
);
$count++;
}
@@ -134,6 +137,5 @@ class DeleteOrphanedTransactions extends Command
if (0 === $count) {
$this->info('No orphaned transactions.');
}
}
}

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

@@ -167,9 +167,12 @@ class FixAccountTypes extends Command
$dest->save();
$this->info(
sprintf(
'Transaction journal #%d, destination account changed from #%d ("%s") to #%d ("%s").', $journal->id,
$oldDest->id, $oldDest->name,
$result->id, $result->name
'Transaction journal #%d, destination account changed from #%d ("%s") to #%d ("%s").',
$journal->id,
$oldDest->id,
$oldDest->name,
$result->id,
$result->name
)
);
$this->inspectJournal($journal);
@@ -184,9 +187,12 @@ class FixAccountTypes extends Command
$source->save();
$this->info(
sprintf(
'Transaction journal #%d, source account changed from #%d ("%s") to #%d ("%s").', $journal->id,
$oldSource->id, $oldSource->name,
$result->id, $result->name
'Transaction journal #%d, source account changed from #%d ("%s") to #%d ("%s").',
$journal->id,
$oldSource->id,
$oldSource->name,
$result->id,
$result->name
)
);
$this->inspectJournal($journal);
@@ -198,7 +204,6 @@ class FixAccountTypes extends Command
break;
}
}
/**
@@ -273,5 +278,4 @@ class FixAccountTypes extends Command
$this->fixJournal($journal, $type, $sourceTransaction, $destTransaction);
}
}
}

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

@@ -51,16 +51,6 @@ class FixRecurringTransactions extends Command
/** @var UserRepositoryInterface */
private $userRepos;
/**
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
parent::__construct();
}
/**
* Execute the console command.
*

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

@@ -94,7 +94,8 @@ class FixUnevenAmount extends Command
if (null === $source) {
$this->error(
sprintf(
'Journal #%d ("%s") has no source transaction. It will be deleted to maintain database consistency.', $journal->id ?? 0,
'Journal #%d ("%s") has no source transaction. It will be deleted to maintain database consistency.',
$journal->id ?? 0,
$journal->description ?? ''
)
);
@@ -113,7 +114,8 @@ class FixUnevenAmount extends Command
if (null === $destination) {
$this->error(
sprintf(
'Journal #%d ("%s") has no destination transaction. It will be deleted to maintain database consistency.', $journal->id ?? 0,
'Journal #%d ("%s") has no destination transaction. It will be deleted to maintain database consistency.',
$journal->id ?? 0,
$journal->description ?? ''
)
);

2
app/Console/Commands/DecryptDatabase.php
View File

@@ -92,7 +92,7 @@ class DecryptDatabase extends Command
// A separate routine for preferences:
if ('preferences' === $table) {
// try to json_decrypt the value.
$value = json_decode($value, true) ?? $value;
$value = json_decode($value, true, 512, JSON_THROW_ON_ERROR) ?? $value;
Log::debug(sprintf('Decrypted field "%s" "%s" to "%s" in table "%s" (row #%d)', $field, $original, print_r($value, true), $table, $id));
/** @var Preference $object */

12
app/Console/Commands/Export/ExportData.php
View File

@@ -76,21 +76,12 @@ class ExportData extends Command
/** @var User */
private $user;
/**
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
parent::__construct();
}
/**
* Execute the console command.
*
* @return int
* @throws FireflyException
* @throws \League\Csv\CannotInsertRecord
*/
public function handle(): int
{
@@ -206,6 +197,7 @@ class ExportData extends Command
*
* @return Carbon
* @throws FireflyException
* @throws \Exception
*/
private function getDateParameter(string $field): Carbon
{

4
app/Console/Commands/Import/CreateCSVImport.php
View File

@@ -93,7 +93,7 @@ class CreateCSVImport extends Command
$this->importRepository->setUser($user);
$configurationData = json_decode(file_get_contents($configuration), true);
$configurationData = json_decode(file_get_contents($configuration), true, 512, JSON_THROW_ON_ERROR);
$this->importJob = $this->importRepository->create('file');
@@ -214,7 +214,7 @@ class CreateCSVImport extends Command
return false;
}
$configurationData = json_decode(file_get_contents($configuration), true);
$configurationData = json_decode(file_get_contents($configuration), true, 512, JSON_THROW_ON_ERROR);
if (null === $configurationData) {
$this->errorLine(sprintf('Firefly III cannot read the contents of configuration file "%s" (working directory: "%s").', $configuration, $cwd));

4
app/Console/Commands/Integrity/RestoreOAuthKeys.php
View File

@@ -21,8 +21,6 @@
namespace FireflyIII\Console\Commands\Integrity;
use Artisan;
use Crypt;
use FireflyIII\Support\System\OAuthKeys;
use Illuminate\Console\Command;
@@ -122,4 +120,4 @@ class RestoreOAuthKeys extends Command
{
OAuthKeys::storeKeysInDB();
}
}
}

1
app/Console/Commands/ScanAttachments.php
View File

@@ -64,7 +64,6 @@ class ScanAttachments extends Command
/** @var Attachment $attachment */
foreach ($attachments as $attachment) {
$fileName = $attachment->fileName();
$decryptedContent = '';
try {
$encryptedContent = $disk->get($fileName);
} catch (FileNotFoundException $e) {

10
app/Console/Commands/SetLatestVersion.php
View File

@@ -43,16 +43,6 @@ class SetLatestVersion extends Command
*/
protected $signature = 'firefly-iii:set-latest-version {--james-is-cool}';
/**
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
parent::__construct();
}
/**
* Execute the console command.
*

4
app/Console/Commands/Tools/Cron.php
View File

@@ -100,9 +100,11 @@ class Cron extends Command
/**
* @param bool $force
* @param Carbon|null $date
*
* @throws FireflyException
* @throws Exception
*/
private function autoBudgetCronJob(bool $force, ?Carbon $date)
private function autoBudgetCronJob(bool $force, ?Carbon $date): void
{
$autoBudget = new AutoBudgetCronjob;
$autoBudget->setForce($force);

3
app/Console/Commands/Upgrade/AccountCurrencies.php
View File

@@ -178,7 +178,8 @@ class AccountCurrencies extends Command
static function (Transaction $transaction) use ($accountCurrency) {
$transaction->transaction_currency_id = $accountCurrency;
$transaction->save();
});
}
);
$this->line(sprintf('Account #%d ("%s") now has a correct currency for opening balance.', $account->id, $account->name));
$this->count++;

2
app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php
View File

@@ -115,7 +115,7 @@ class MigrateRecurrenceMeta extends Command
if ('tags' === $meta->name) {
$array = explode(',', $meta->value);
$value = json_encode($array);
$value = json_encode($array, JSON_THROW_ON_ERROR, 512);
}
RecurrenceTransactionMeta::create(

20
app/Console/Commands/Upgrade/MigrateToGroups.php
View File

@@ -302,7 +302,8 @@ class MigrateToGroups extends Command
$this->error(
sprintf(
'Journal #%d has no opposing transaction for transaction #%d. Cannot upgrade this entry.',
$journal->id, $transaction->id
$journal->id,
$transaction->id
)
);
continue;
@@ -365,12 +366,20 @@ class MigrateToGroups extends Command
// report on result:
Log::debug(
sprintf('Migrated journal #%d into group #%d with these journals: #%s',
$journal->id, $group->id, implode(', #', $group->transactionJournals->pluck('id')->toArray()))
sprintf(
'Migrated journal #%d into group #%d with these journals: #%s',
$journal->id,
$group->id,
implode(', #', $group->transactionJournals->pluck('id')->toArray())
)
);
$this->line(
sprintf('Migrated journal #%d into group #%d with these journals: #%s',
$journal->id, $group->id, implode(', #', $group->transactionJournals->pluck('id')->toArray()))
sprintf(
'Migrated journal #%d into group #%d with these journals: #%s',
$journal->id,
$group->id,
implode(', #', $group->transactionJournals->pluck('id')->toArray())
)
);
}
@@ -447,5 +456,4 @@ class MigrateToGroups extends Command
{
app('fireflyconfig')->set(self::CONFIG_NAME, true);
}
}

6
app/Console/Commands/Upgrade/MigrateToRules.php
View File

@@ -177,9 +177,9 @@ class MigrateToRules extends Command
}
/**
* @param RuleGroup $ruleGroup
* @param Bill $bill
* @throws FireflyException
* @param RuleGroup $ruleGroup
* @param Bill $bill
* @param Preference $language
*/
private function migrateBill(RuleGroup $ruleGroup, Bill $bill, Preference $language): void
{

11
app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php
View File

@@ -40,7 +40,6 @@ use Illuminate\Console\Command;
*/
class OtherCurrenciesCorrections extends Command
{
public const CONFIG_NAME = '480_other_currencies';
/**
* The console command description.
@@ -136,8 +135,6 @@ class OtherCurrenciesCorrections extends Command
$this->accountCurrencies[$accountId] = $currency;
return $currency;
}
/**
@@ -186,8 +183,12 @@ class OtherCurrenciesCorrections extends Command
$currency = $this->getCurrency($account);
if (null === $currency) {
// @codeCoverageIgnoreStart
$this->error(sprintf('Account #%d ("%s") has no currency preference, so transaction journal #%d can\'t be corrected',
$account->id, $account->name, $journal->id));
$this->error(sprintf(
'Account #%d ("%s") has no currency preference, so transaction journal #%d can\'t be corrected',
$account->id,
$account->name,
$journal->id
));
$this->count++;
return;

2
app/Console/Commands/Upgrade/RenameAccountMeta.php
View File

@@ -76,7 +76,7 @@ class RenameAccountMeta extends Command
$count += AccountMeta::where('name', $old)->update(['name' => $new]);
// delete empty entries while we're at it.
AccountMeta::where('name', $new)->where('data','""')->delete();
AccountMeta::where('name', $new)->where('data', '""')->delete();
}
$this->markAsExecuted();

55
app/Console/Commands/Upgrade/TransferCurrenciesCorrections.php
View File

@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Console\Commands\Upgrade;
use FireflyIII\Models\Account;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionCurrency;
@@ -41,7 +40,6 @@ use Log;
*/
class TransferCurrenciesCorrections extends Command
{
public const CONFIG_NAME = '480_transfer_currencies';
/**
* The console command description.
@@ -162,8 +160,6 @@ class TransferCurrenciesCorrections extends Command
$this->accountCurrencies[$accountId] = $result;
return $result;
}
/**
@@ -297,7 +293,6 @@ class TransferCurrenciesCorrections extends Command
*/
private function updateTransferCurrency(TransactionJournal $transfer): void
{
$this->resetInformation();
// @codeCoverageIgnoreStart
@@ -325,7 +320,8 @@ class TransferCurrenciesCorrections extends Command
// @codeCoverageIgnoreStart
if ($this->isNoCurrencyPresent()) {
$this->error(
sprintf('Source or destination accounts for transaction journal #%d have no currency information. Cannot fix this one.', $transfer->id));
sprintf('Source or destination accounts for transaction journal #%d have no currency information. Cannot fix this one.', $transfer->id)
);
return;
}
@@ -355,7 +351,6 @@ class TransferCurrenciesCorrections extends Command
// fix journal itself:
$this->fixTransactionJournalCurrency($transfer);
}
/**
@@ -367,8 +362,11 @@ class TransferCurrenciesCorrections extends Command
if (null === $this->sourceTransaction->transaction_currency_id && null !== $this->sourceCurrency) {
$this->sourceTransaction
->transaction_currency_id = (int)$this->sourceCurrency->id;
$message = sprintf('Transaction #%d has no currency setting, now set to %s.',
$this->sourceTransaction->id, $this->sourceCurrency->code);
$message = sprintf(
'Transaction #%d has no currency setting, now set to %s.',
$this->sourceTransaction->id,
$this->sourceCurrency->code
);
Log::debug($message);
$this->line($message);
$this->count++;
@@ -385,8 +383,11 @@ class TransferCurrenciesCorrections extends Command
if (null === $this->destinationTransaction->transaction_currency_id && null !== $this->destinationCurrency) {
$this->destinationTransaction
->transaction_currency_id = (int)$this->destinationCurrency->id;
$message = sprintf('Transaction #%d has no currency setting, now set to %s.',
$this->destinationTransaction->id, $this->destinationCurrency->code);
$message = sprintf(
'Transaction #%d has no currency setting, now set to %s.',
$this->destinationTransaction->id,
$this->destinationCurrency->code
);
Log::debug($message);
$this->line($message);
$this->count++;
@@ -490,9 +491,13 @@ class TransferCurrenciesCorrections extends Command
sprintf(
'Currency for account "%s" is %s, and currency for account "%s" is also
%s, so transactions #%d and #%d has been verified to be to %s exclusively.',
$this->destinationAccount->name, $this->destinationCurrency->code,
$this->sourceAccount->name, $this->sourceCurrency->code,
$this->sourceTransaction->id, $this->destinationTransaction->id, $this->sourceCurrency->code
$this->destinationAccount->name,
$this->destinationCurrency->code,
$this->sourceAccount->name,
$this->sourceCurrency->code,
$this->sourceTransaction->id,
$this->destinationTransaction->id,
$this->sourceCurrency->code
)
);
}
@@ -528,8 +533,11 @@ class TransferCurrenciesCorrections extends Command
$this->sourceTransaction->foreign_amount = bcmul((string)$this->destinationTransaction->foreign_amount, '-1');
$this->sourceTransaction->save();
$this->count++;
Log::debug(sprintf('Restored foreign amount of source transaction #%d to %s',
$this->sourceTransaction->id, $this->sourceTransaction->foreign_amount));
Log::debug(sprintf(
'Restored foreign amount of source transaction #%d to %s',
$this->sourceTransaction->id,
$this->sourceTransaction->foreign_amount
));
}
}
@@ -543,8 +551,11 @@ class TransferCurrenciesCorrections extends Command
$this->destinationTransaction->foreign_amount = bcmul((string)$this->sourceTransaction->foreign_amount, '-1');
$this->destinationTransaction->save();
$this->count++;
Log::debug(sprintf('Restored foreign amount of destination transaction #%d to %s',
$this->destinationTransaction->id, $this->destinationTransaction->foreign_amount));
Log::debug(sprintf(
'Restored foreign amount of destination transaction #%d to %s',
$this->destinationTransaction->id,
$this->destinationTransaction->foreign_amount
));
}
}
@@ -565,8 +576,11 @@ class TransferCurrenciesCorrections extends Command
// destination account must have a currency preference.
if (null === $this->destinationCurrency) {
$message = sprintf('Account #%d ("%s") must have currency preference but has none.',
$this->destinationAccount->id, $this->destinationAccount->name);
$message = sprintf(
'Account #%d ("%s") must have currency preference but has none.',
$this->destinationAccount->id,
$this->destinationAccount->name
);
Log::error($message);
$this->error($message);
@@ -575,5 +589,4 @@ class TransferCurrenciesCorrections extends Command
return false;
}
}