diff --git a/app/Console/Commands/UpgradeFireflyInstructions.php b/app/Console/Commands/UpgradeFireflyInstructions.php index df007ab40f..866884de56 100644 --- a/app/Console/Commands/UpgradeFireflyInstructions.php +++ b/app/Console/Commands/UpgradeFireflyInstructions.php @@ -63,20 +63,21 @@ class UpgradeFireflyInstructions extends Command } - if (is_null($text)) { $this->line(sprintf('Thank you for installing Firefly III, v%s', $version)); $this->info('There are no extra upgrade instructions.'); $this->line('Firefly III should be ready for use.'); - } else { - $this->line('+------------------------------------------------------------------------------+'); - $this->line(''); - $this->line(sprintf('Thank you for installing Firefly III, v%s', $version)); - $this->info(wordwrap($text)); - $this->line(''); - $this->line('+------------------------------------------------------------------------------+'); + + return; } + $this->line('+------------------------------------------------------------------------------+'); + $this->line(''); + $this->line(sprintf('Thank you for installing Firefly III, v%s', $version)); + $this->info(wordwrap($text)); + $this->line(''); + $this->line('+------------------------------------------------------------------------------+'); + } } diff --git a/app/Console/Commands/VerifyDatabase.php b/app/Console/Commands/VerifyDatabase.php index 47b40ca69f..7ed6b8f990 100644 --- a/app/Console/Commands/VerifyDatabase.php +++ b/app/Console/Commands/VerifyDatabase.php @@ -174,10 +174,8 @@ class VerifyDatabase extends Command $configuration = [ // a withdrawal can not have revenue account: TransactionType::WITHDRAWAL => [AccountType::REVENUE], - // deposit cannot have an expense account: TransactionType::DEPOSIT => [AccountType::EXPENSE], - // transfer cannot have either: TransactionType::TRANSFER => [AccountType::EXPENSE, AccountType::REVENUE], ]; diff --git a/app/Events/BlockedBadLogin.php b/app/Events/BlockedBadLogin.php index fb984abd04..f3239bd7f8 100644 --- a/app/Events/BlockedBadLogin.php +++ b/app/Events/BlockedBadLogin.php @@ -16,7 +16,7 @@ namespace FireflyIII\Events; use Illuminate\Queue\SerializesModels; /** - * Class LockedOutUser + * Class BlockedBadLogin * * @package FireflyIII\Events */ @@ -28,7 +28,7 @@ class BlockedBadLogin extends Event public $ipAddress; /** - * Create a new event instance. This event is triggered when a user gets themselves locked out. + * Create a new event instance. This event is triggered when a bad login is blocked. * * @param string $email * @param string $ipAddress diff --git a/app/Events/BlockedUseOfDomain.php b/app/Events/BlockedUseOfDomain.php index 0ccacea749..2cb252a385 100644 --- a/app/Events/BlockedUseOfDomain.php +++ b/app/Events/BlockedUseOfDomain.php @@ -19,6 +19,7 @@ use Illuminate\Queue\SerializesModels; /** * Class BlockedUseOfDomain * + * @deprecated * @package FireflyIII\Events */ class BlockedUseOfDomain extends Event @@ -31,6 +32,7 @@ class BlockedUseOfDomain extends Event /** * Create a new event instance. This event is triggered when a user tries to register with a banned domain (on blocked domain list). * + * @deprecated * @param string $email * @param string $ipAddress */