kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 23:45:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop

Browse Source
This commit is contained in:
James Cole
2020-09-11 07:11:43 +02:00
parent c2ff26b515 402351a6b7
commit 22dc03f32c
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/Console/Commands/UpgradeFireflyInstructions.php
View File

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

12
app/Support/Search/OperatorQuerySearch.php
View File

@@ -37,10 +37,16 @@ use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use FireflyIII\Repositories\TransactionType\TransactionTypeRepositoryInterface; use FireflyIII\Repositories\TransactionType\TransactionTypeRepositoryInterface;
use FireflyIII\Support\ParseDateString; use FireflyIII\Support\ParseDateString;
use FireflyIII\User; 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\Field;
use Gdbots\QueryParser\Node\Hashtag;
use Gdbots\QueryParser\Node\Mention;
use Gdbots\QueryParser\Node\Node; use Gdbots\QueryParser\Node\Node;
use Gdbots\QueryParser\Node\Numbr; use Gdbots\QueryParser\Node\Numbr;
use Gdbots\QueryParser\Node\Phrase; use Gdbots\QueryParser\Node\Phrase;
use Gdbots\QueryParser\Node\Url;
use Gdbots\QueryParser\Node\Word; use Gdbots\QueryParser\Node\Word;
use Gdbots\QueryParser\ParsedQuery; use Gdbots\QueryParser\ParsedQuery;
use Gdbots\QueryParser\QueryParser; use Gdbots\QueryParser\QueryParser;
@@ -222,6 +228,12 @@ class OperatorQuerySearch implements SearchInterface
case Word::class: case Word::class:
case Phrase::class: case Phrase::class:
case Numbr::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)); Log::debug(sprintf('Now handle %s', $class));
$this->words[] = (string) $searchNode->getValue(); $this->words[] = (string) $searchNode->getValue();
break; break;