diff --git a/app/Console/Commands/UpgradeFireflyInstructions.php b/app/Console/Commands/UpgradeFireflyInstructions.php index 67cd1db0f0..e2fb1027a4 100644 --- a/app/Console/Commands/UpgradeFireflyInstructions.php +++ b/app/Console/Commands/UpgradeFireflyInstructions.php @@ -26,6 +26,7 @@ namespace FireflyIII\Console\Commands; use FireflyIII\Support\System\GeneratesInstallationId; use FireflyIII\User; use Illuminate\Console\Command; +use Illuminate\Database\QueryException; /** * Class UpgradeFireflyInstructions. @@ -56,10 +57,10 @@ class UpgradeFireflyInstructions extends Command public function handle(): int { $this->generateInstallationId(); - if ('update' === (string) $this->argument('task')) { + if ('update' === (string)$this->argument('task')) { $this->updateInstructions(); } - if ('install' === (string) $this->argument('task')) { + if ('install' === (string)$this->argument('task')) { $this->installInstructions(); } @@ -70,7 +71,11 @@ class UpgradeFireflyInstructions extends Command app('telemetry')->feature('system.database.driver', env('DB_CONNECTION', '(unknown)')); app('telemetry')->feature('system.os.is_docker', $isDocker); app('telemetry')->feature('system.command.executed', $this->signature); - app('telemetry')->feature('system.users.count', (string) User::count()); + try { + app('telemetry')->feature('system.users.count', (string)User::count()); + } catch (QueryException $e) { + // ignore error. + } return 0; } @@ -108,8 +113,8 @@ class UpgradeFireflyInstructions extends Command { /** @var string $version */ $version = config('firefly.version'); - $config = config('upgrade.text.install'); - $text = ''; + $config = config('upgrade.text.install'); + $text = ''; foreach (array_keys($config) as $compare) { // if string starts with: if (0 === strpos($version, $compare)) { @@ -156,8 +161,8 @@ class UpgradeFireflyInstructions extends Command { /** @var string $version */ $version = config('firefly.version'); - $config = config('upgrade.text.upgrade'); - $text = ''; + $config = config('upgrade.text.upgrade'); + $text = ''; foreach (array_keys($config) as $compare) { // if string starts with: if (0 === strpos($version, $compare)) {