mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop
This commit is contained in:
commit
22dc03f32c
@ -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)) {
|
||||
|
@ -37,10 +37,16 @@ use FireflyIII\Repositories\Tag\TagRepositoryInterface;
|
||||
use FireflyIII\Repositories\TransactionType\TransactionTypeRepositoryInterface;
|
||||
use FireflyIII\Support\ParseDateString;
|
||||
use FireflyIII\User;
|
||||
use Gdbots\QueryParser\Node\Date;
|
||||
use Gdbots\QueryParser\Node\Emoji;
|
||||
use Gdbots\QueryParser\Node\Emoticon;
|
||||
use Gdbots\QueryParser\Node\Field;
|
||||
use Gdbots\QueryParser\Node\Hashtag;
|
||||
use Gdbots\QueryParser\Node\Mention;
|
||||
use Gdbots\QueryParser\Node\Node;
|
||||
use Gdbots\QueryParser\Node\Numbr;
|
||||
use Gdbots\QueryParser\Node\Phrase;
|
||||
use Gdbots\QueryParser\Node\Url;
|
||||
use Gdbots\QueryParser\Node\Word;
|
||||
use Gdbots\QueryParser\ParsedQuery;
|
||||
use Gdbots\QueryParser\QueryParser;
|
||||
@ -222,6 +228,12 @@ class OperatorQuerySearch implements SearchInterface
|
||||
case Word::class:
|
||||
case Phrase::class:
|
||||
case Numbr::class:
|
||||
case Url::class:
|
||||
case Date::class:
|
||||
case Hashtag::class:
|
||||
case Emoticon::class:
|
||||
case Emoji::class:
|
||||
case Mention::class:
|
||||
Log::debug(sprintf('Now handle %s', $class));
|
||||
$this->words[] = (string) $searchNode->getValue();
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user