kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 02:26:58 +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

37
.ci/phpcs.sh Executable file
View File

@@ -0,0 +1,37 @@
#!/usr/bin/env bash
#
# phpstan.sh
# Copyright (c) 2021 james@firefly-iii.org
#
# This file is part of Firefly III (https://github.com/firefly-iii).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
#
# Install composer packages
#composer install --no-scripts --no-ansi
SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
# enable test .env file.
# cp .ci/.env.ci .env
# clean up php code
cd $SCRIPT_DIR/php-cs-fixer
composer update
./vendor/bin/php-cs-fixer fix $SCRIPT_DIR/../app/Console --config $SCRIPT_DIR/php-cs-fixer/.php-cs-fixer.php --allow-risky=yes
cd $SCRIPT_DIR/..
exit 0

6
.ci/phpstan.sh
View File

@@ -28,12 +28,6 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
# enable test .env file. # enable test .env file.
# cp .ci/.env.ci .env # cp .ci/.env.ci .env
# clean up php code
cd $SCRIPT_DIR/php-cs-fixer
composer update
./vendor/bin/php-cs-fixer fix $SCRIPT_DIR/../app/Console --config $SCRIPT_DIR/php-cs-fixer/.php-cs-fixer.php --allow-risky=yes
cd $SCRIPT_DIR/..
# Do static code analysis. # Do static code analysis.
# ./vendor/bin/phpstan analyse -c .ci/phpstan.neon --no-progress # ./vendor/bin/phpstan analyse -c .ci/phpstan.neon --no-progress
./vendor/bin/phpstan analyse -c .ci/phpstan.neon ./vendor/bin/phpstan analyse -c .ci/phpstan.neon

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

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Console\Commands\Correction; namespace FireflyIII\Console\Commands\Correction;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType; use FireflyIII\Models\AccountType;
use FireflyIII\Models\Transaction; use FireflyIII\Models\Transaction;
@@ -135,7 +136,7 @@ class CorrectOpeningBalanceCurrencies extends Command
* *
* @return TransactionCurrency * @return TransactionCurrency
* @throws JsonException * @throws JsonException
* @throws \FireflyIII\Exceptions\FireflyException * @throws FireflyException
*/ */
private function getCurrency(Account $account): TransactionCurrency private function getCurrency(Account $account): TransactionCurrency
{ {

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

@@ -66,6 +66,34 @@ class DeleteOrphanedTransactions extends Command
return 0; 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 * @throws Exception
*/ */
@@ -137,32 +165,4 @@ class DeleteOrphanedTransactions extends Command
$this->info('No orphaned accounts.'); $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
)
);
}
}
}
}
} }

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

@@ -32,6 +32,8 @@ use Illuminate\Console\Command;
use Illuminate\Contracts\Encryption\DecryptException; use Illuminate\Contracts\Encryption\DecryptException;
use JsonException; use JsonException;
use Log; use Log;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use stdClass; use stdClass;
/** /**
@@ -109,8 +111,8 @@ class DecryptDatabase extends Command
* @param string $table * @param string $table
* *
* @return bool * @return bool
* @throws \Psr\Container\ContainerExceptionInterface * @throws ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface * @throws NotFoundExceptionInterface
*/ */
private function isDecrypted(string $table): bool private function isDecrypted(string $table): bool
{ {

33
app/Console/Commands/Integrity/UpdateGroupInformation.php
View File

@@ -47,19 +47,18 @@ use Illuminate\Console\Command;
*/ */
class UpdateGroupInformation extends Command class UpdateGroupInformation extends Command
{ {
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'firefly-iii:upgrade-group-information';
/** /**
* The console command description. * The console command description.
* *
* @var string * @var string
*/ */
protected $description = 'Makes sure that every object is linked to a group'; protected $description = 'Makes sure that every object is linked to a group';
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'firefly-iii:upgrade-group-information';
/** /**
* Execute the console command. * Execute the console command.
@@ -87,10 +86,22 @@ class UpdateGroupInformation extends Command
$this->warn(sprintf('User "%s" has no group.', $user->email)); $this->warn(sprintf('User "%s" has no group.', $user->email));
return; return;
} }
$set = [Account::class, Attachment::class, AvailableBudget::class, $set = [
Bill::class, Budget::class, Category::class, CurrencyExchangeRate::class, Account::class,
Recurrence::class, RuleGroup::class, Rule::class, Tag::class, TransactionGroup::class, Attachment::class,
TransactionJournal::class, Webhook::class]; AvailableBudget::class,
Bill::class,
Budget::class,
Category::class,
CurrencyExchangeRate::class,
Recurrence::class,
RuleGroup::class,
Rule::class,
Tag::class,
TransactionGroup::class,
TransactionJournal::class,
Webhook::class,
];
foreach ($set as $className) { foreach ($set as $className) {
$this->updateGroupInfoForObject($user, $group, $className); $this->updateGroupInfoForObject($user, $group, $className);
} }

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

@@ -121,6 +121,33 @@ class Cron extends Command
return 0; return 0;
} }
/**
* @param bool $force
* @param Carbon|null $date
* @throws FireflyException
*/
private function exchangeRatesCronJob(bool $force, ?Carbon $date): void
{
$exchangeRates = new ExchangeRatesCronjob();
$exchangeRates->setForce($force);
// set date in cron job:
if (null !== $date) {
$exchangeRates->setDate($date);
}
$exchangeRates->fire();
if ($exchangeRates->jobErrored) {
$this->error(sprintf('Error in "exchange rates" cron: %s', $exchangeRates->message));
}
if ($exchangeRates->jobFired) {
$this->line(sprintf('"Exchange rates" cron fired: %s', $exchangeRates->message));
}
if ($exchangeRates->jobSucceeded) {
$this->info(sprintf('"Exchange rates" cron ran with success: %s', $exchangeRates->message));
}
}
/** /**
* @param bool $force * @param bool $force
* @param Carbon|null $date * @param Carbon|null $date
@@ -202,31 +229,4 @@ class Cron extends Command
$this->info(sprintf('"Send bill warnings" cron ran with success: %s', $autoBudget->message)); $this->info(sprintf('"Send bill warnings" cron ran with success: %s', $autoBudget->message));
} }
} }
/**
* @param bool $force
* @param Carbon|null $date
* @throws FireflyException
*/
private function exchangeRatesCronJob(bool $force, ?Carbon $date): void
{
$exchangeRates = new ExchangeRatesCronjob();
$exchangeRates->setForce($force);
// set date in cron job:
if (null !== $date) {
$exchangeRates->setDate($date);
}
$exchangeRates->fire();
if ($exchangeRates->jobErrored) {
$this->error(sprintf('Error in "exchange rates" cron: %s', $exchangeRates->message));
}
if ($exchangeRates->jobFired) {
$this->line(sprintf('"Exchange rates" cron fired: %s', $exchangeRates->message));
}
if ($exchangeRates->jobSucceeded) {
$this->info(sprintf('"Exchange rates" cron ran with success: %s', $exchangeRates->message));
}
}
} }

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

@@ -34,6 +34,8 @@ use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Log; use Log;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
/** /**
* Class AccountCurrencies * Class AccountCurrencies
@@ -109,8 +111,8 @@ class AccountCurrencies extends Command
/** /**
* @return bool * @return bool
* @throws FireflyException * @throws FireflyException
* @throws \Psr\Container\ContainerExceptionInterface * @throws ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface * @throws NotFoundExceptionInterface
*/ */
private function isExecuted(): bool private function isExecuted(): bool
{ {

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

@@ -27,6 +27,8 @@ use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\BudgetLimit; use FireflyIII\Models\BudgetLimit;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Log; use Log;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
class AppendBudgetLimitPeriods extends Command class AppendBudgetLimitPeriods extends Command
{ {
@@ -72,8 +74,8 @@ class AppendBudgetLimitPeriods extends Command
/** /**
* @return bool * @return bool
* @throws FireflyException * @throws FireflyException
* @throws \Psr\Container\ContainerExceptionInterface * @throws ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface * @throws NotFoundExceptionInterface
*/ */
private function isExecuted(): bool private function isExecuted(): bool
{ {

10
app/Console/Commands/Upgrade/BackToJournals.php
View File

@@ -32,6 +32,8 @@ use FireflyIII\Models\TransactionJournal;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log; use Log;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
/** /**
* Class BackToJournals * Class BackToJournals
@@ -85,8 +87,8 @@ class BackToJournals extends Command
/** /**
* @return bool * @return bool
* @throws FireflyException * @throws FireflyException
* @throws \Psr\Container\ContainerExceptionInterface * @throws ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface * @throws NotFoundExceptionInterface
*/ */
private function isMigrated(): bool private function isMigrated(): bool
{ {
@@ -98,8 +100,8 @@ class BackToJournals extends Command
/** /**
* @return bool * @return bool
* @throws FireflyException * @throws FireflyException
* @throws \Psr\Container\ContainerExceptionInterface * @throws ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface * @throws NotFoundExceptionInterface
*/ */
private function isExecuted(): bool private function isExecuted(): bool
{ {

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

@@ -27,6 +27,8 @@ use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\BudgetLimit; use FireflyIII\Models\BudgetLimit;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use JsonException; use JsonException;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
/** /**
* Class BudgetLimitCurrency * Class BudgetLimitCurrency
@@ -99,8 +101,8 @@ class BudgetLimitCurrency extends Command
/** /**
* @return bool * @return bool
* @throws FireflyException * @throws FireflyException
* @throws \Psr\Container\ContainerExceptionInterface * @throws ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface * @throws NotFoundExceptionInterface
*/ */
private function isExecuted(): bool private function isExecuted(): bool
{ {

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

@@ -28,6 +28,8 @@ use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType; use FireflyIII\Models\AccountType;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
/** /**
* Class CCLiabilities * Class CCLiabilities
@@ -96,8 +98,8 @@ class CCLiabilities extends Command
/** /**
* @return bool * @return bool
* @throws FireflyException * @throws FireflyException
* @throws \Psr\Container\ContainerExceptionInterface * @throws ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface * @throws NotFoundExceptionInterface
*/ */
private function isExecuted(): bool private function isExecuted(): bool
{ {

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

@@ -31,6 +31,8 @@ use FireflyIII\Models\UserRole;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Log; use Log;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
/** /**
* Class CreateGroupMemberships * Class CreateGroupMemberships
@@ -77,8 +79,8 @@ class CreateGroupMemberships extends Command
/** /**
* @return bool * @return bool
* @throws FireflyException * @throws FireflyException
* @throws \Psr\Container\ContainerExceptionInterface * @throws ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface * @throws NotFoundExceptionInterface
*/ */
private function isExecuted(): bool private function isExecuted(): bool
{ {

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

@@ -28,6 +28,8 @@ use FireflyIII\Models\Attachment;
use FireflyIII\Models\Note; use FireflyIII\Models\Note;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Log; use Log;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
/** /**
* Class MigrateAttachments * Class MigrateAttachments
@@ -105,8 +107,8 @@ class MigrateAttachments extends Command
/** /**
* @return bool * @return bool
* @throws FireflyException * @throws FireflyException
* @throws \Psr\Container\ContainerExceptionInterface * @throws ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface * @throws NotFoundExceptionInterface
*/ */
private function isExecuted(): bool private function isExecuted(): bool
{ {

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

@@ -29,6 +29,8 @@ use FireflyIII\Models\Note;
use FireflyIII\Models\TransactionJournalMeta; use FireflyIII\Models\TransactionJournalMeta;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Log; use Log;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
/** /**
* Class MigrateJournalNotes * Class MigrateJournalNotes
@@ -105,8 +107,8 @@ class MigrateJournalNotes extends Command
/** /**
* @return bool * @return bool
* @throws FireflyException * @throws FireflyException
* @throws \Psr\Container\ContainerExceptionInterface * @throws ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface * @throws NotFoundExceptionInterface
*/ */
private function isExecuted(): bool private function isExecuted(): bool
{ {

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

@@ -29,6 +29,8 @@ use FireflyIII\Models\RecurrenceMeta;
use FireflyIII\Models\RecurrenceTransactionMeta; use FireflyIII\Models\RecurrenceTransactionMeta;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use JsonException; use JsonException;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
/** /**
* Class MigrateRecurrenceMeta * Class MigrateRecurrenceMeta
@@ -84,8 +86,8 @@ class MigrateRecurrenceMeta extends Command
/** /**
* @return bool * @return bool
* @throws FireflyException * @throws FireflyException
* @throws \Psr\Container\ContainerExceptionInterface * @throws ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface * @throws NotFoundExceptionInterface
*/ */
private function isExecuted(): bool private function isExecuted(): bool
{ {

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

@@ -29,6 +29,8 @@ use FireflyIII\Models\Recurrence;
use FireflyIII\Models\RecurrenceTransaction; use FireflyIII\Models\RecurrenceTransaction;
use FireflyIII\Models\TransactionType; use FireflyIII\Models\TransactionType;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
/** /**
* Class MigrateRecurrenceType * Class MigrateRecurrenceType
@@ -77,8 +79,8 @@ class MigrateRecurrenceType extends Command
/** /**
* @return bool * @return bool
* @throws FireflyException * @throws FireflyException
* @throws \Psr\Container\ContainerExceptionInterface * @throws ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface * @throws NotFoundExceptionInterface
*/ */
private function isExecuted(): bool private function isExecuted(): bool
{ {

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

@@ -28,6 +28,8 @@ use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Location; use FireflyIII\Models\Location;
use FireflyIII\Models\Tag; use FireflyIII\Models\Tag;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
/** /**
* Class MigrateTagLocations * Class MigrateTagLocations
@@ -74,8 +76,8 @@ class MigrateTagLocations extends Command
/** /**
* @return bool * @return bool
* @throws FireflyException * @throws FireflyException
* @throws \Psr\Container\ContainerExceptionInterface * @throws ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface * @throws NotFoundExceptionInterface
*/ */
private function isExecuted(): bool private function isExecuted(): bool
{ {

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

@@ -37,6 +37,8 @@ use FireflyIII\Services\Internal\Destroy\JournalDestroyService;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log; use Log;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
/** /**
* This command will take split transactions and migrate them to "transaction groups". * This command will take split transactions and migrate them to "transaction groups".
@@ -129,8 +131,8 @@ class MigrateToGroups extends Command
/** /**
* @return bool * @return bool
* @throws FireflyException * @throws FireflyException
* @throws \Psr\Container\ContainerExceptionInterface * @throws ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface * @throws NotFoundExceptionInterface
*/ */
private function isMigrated(): bool private function isMigrated(): bool
{ {

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

@@ -33,6 +33,8 @@ use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
/** /**
* Class MigrateToRules * Class MigrateToRules
@@ -120,8 +122,8 @@ class MigrateToRules extends Command
/** /**
* @return bool * @return bool
* @throws FireflyException * @throws FireflyException
* @throws \Psr\Container\ContainerExceptionInterface * @throws ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface * @throws NotFoundExceptionInterface
*/ */
private function isExecuted(): bool private function isExecuted(): bool
{ {

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

@@ -35,6 +35,8 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface; use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
/** /**
* Class OtherCurrenciesCorrections * Class OtherCurrenciesCorrections
@@ -115,8 +117,8 @@ class OtherCurrenciesCorrections extends Command
/** /**
* @return bool * @return bool
* @throws FireflyException * @throws FireflyException
* @throws \Psr\Container\ContainerExceptionInterface * @throws ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface * @throws NotFoundExceptionInterface
*/ */
private function isExecuted(): bool private function isExecuted(): bool
{ {

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

@@ -26,6 +26,8 @@ namespace FireflyIII\Console\Commands\Upgrade;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\AccountMeta; use FireflyIII\Models\AccountMeta;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
/** /**
* Class RenameAccountMeta * Class RenameAccountMeta
@@ -99,8 +101,8 @@ class RenameAccountMeta extends Command
/** /**
* @return bool * @return bool
* @throws FireflyException * @throws FireflyException
* @throws \Psr\Container\ContainerExceptionInterface * @throws ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface * @throws NotFoundExceptionInterface
*/ */
private function isExecuted(): bool private function isExecuted(): bool
{ {

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

@@ -31,6 +31,8 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Illuminate\Database\QueryException; use Illuminate\Database\QueryException;
use Log; use Log;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use Schema; use Schema;
/** /**
@@ -123,8 +125,8 @@ class TransactionIdentifier extends Command
/** /**
* @return bool * @return bool
* @throws FireflyException * @throws FireflyException
* @throws \Psr\Container\ContainerExceptionInterface * @throws ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface * @throws NotFoundExceptionInterface
*/ */
private function isExecuted(): bool private function isExecuted(): bool
{ {

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

@@ -33,6 +33,8 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface; use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Log; use Log;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
/** /**
* Class TransferCurrenciesCorrections * Class TransferCurrenciesCorrections
@@ -69,8 +71,8 @@ class TransferCurrenciesCorrections extends Command
* *
* @return int * @return int
* @throws FireflyException * @throws FireflyException
* @throws \Psr\Container\ContainerExceptionInterface * @throws ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface * @throws NotFoundExceptionInterface
*/ */
public function handle(): int public function handle(): int
{ {
@@ -137,8 +139,8 @@ class TransferCurrenciesCorrections extends Command
/** /**
* @return bool * @return bool
* @throws FireflyException * @throws FireflyException
* @throws \Psr\Container\ContainerExceptionInterface * @throws ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface * @throws NotFoundExceptionInterface
*/ */
private function isExecuted(): bool private function isExecuted(): bool
{ {

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

@@ -34,6 +34,8 @@ use FireflyIII\Services\Internal\Support\CreditRecalculateService;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Log; use Log;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
/** /**
* Class UpgradeLiabilities * Class UpgradeLiabilities
@@ -81,8 +83,8 @@ class UpgradeLiabilities extends Command
/** /**
* @return bool * @return bool
* @throws FireflyException * @throws FireflyException
* @throws \Psr\Container\ContainerExceptionInterface * @throws ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface * @throws NotFoundExceptionInterface
*/ */
private function isExecuted(): bool private function isExecuted(): bool
{ {

3
app/Console/Commands/VerifySecurityAlerts.php
View File

@@ -25,6 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Console\Commands; namespace FireflyIII\Console\Commands;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use League\Flysystem\FilesystemException;
use Log; use Log;
use Storage; use Storage;
@@ -50,7 +51,7 @@ class VerifySecurityAlerts extends Command
* Execute the console command. * Execute the console command.
* *
* @return int * @return int
* @throws \League\Flysystem\FilesystemException * @throws FilesystemException
*/ */
public function handle(): int public function handle(): int
{ {