kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-04 03:43:07 +00:00
Code Issues Projects Releases Wiki Activity

Rename class.

Browse Source
This commit is contained in:
James Cole
2020-08-22 13:01:37 +02:00
parent 24a373abf4
commit ab5a146277
7 changed files with 245 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Providers/SearchServiceProvider.php
View File

@@ -22,7 +22,7 @@ declare(strict_types=1);
namespace FireflyIII\Providers; namespace FireflyIII\Providers;
use FireflyIII\Support\Search\BetterQuerySearch; use FireflyIII\Support\Search\OperatorQuerySearch;
use FireflyIII\Support\Search\SearchInterface; use FireflyIII\Support\Search\SearchInterface;
use Illuminate\Foundation\Application; use Illuminate\Foundation\Application;
use Illuminate\Support\ServiceProvider; use Illuminate\Support\ServiceProvider;
@@ -48,8 +48,8 @@ class SearchServiceProvider extends ServiceProvider
$this->app->bind( $this->app->bind(
SearchInterface::class, SearchInterface::class,
function (Application $app) { function (Application $app) {
/** @var BetterQuerySearch $search */ /** @var OperatorQuerySearch $search */
$search = app(BetterQuerySearch::class); $search = app(OperatorQuerySearch::class);
if ($app->auth->check()) { if ($app->auth->check()) {
$search->setUser(auth()->user()); $search->setUser(auth()->user());
} }

82
app/Support/Search/BetterQuerySearch.php → app/Support/Search/OperatorQuerySearch.php
View File

@@ -1,6 +1,6 @@
<?php <?php
/* /*
* BetterQuerySearch.php * OperatorQuerySearch.php
* Copyright (c) 2020 james@firefly-iii.org * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
@@ -35,6 +35,7 @@ use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Repositories\Tag\TagRepositoryInterface; use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use FireflyIII\Repositories\TransactionType\TransactionTypeRepositoryInterface; use FireflyIII\Repositories\TransactionType\TransactionTypeRepositoryInterface;
use FireflyIII\Support\ParseDateString;
use FireflyIII\User; use FireflyIII\User;
use Gdbots\QueryParser\Node\Field; use Gdbots\QueryParser\Node\Field;
use Gdbots\QueryParser\Node\Node; use Gdbots\QueryParser\Node\Node;
@@ -47,9 +48,9 @@ use Illuminate\Support\Collection;
use Log; use Log;
/** /**
* Class BetterQuerySearch * Class OperatorQuerySearch
*/ */
class BetterQuerySearch implements SearchInterface class OperatorQuerySearch implements SearchInterface
{ {
private AccountRepositoryInterface $accountRepository; private AccountRepositoryInterface $accountRepository;
private BillRepositoryInterface $billRepository; private BillRepositoryInterface $billRepository;
@@ -69,12 +70,12 @@ class BetterQuerySearch implements SearchInterface
private Collection $operators; private Collection $operators;
/** /**
* BetterQuerySearch constructor. * OperatorQuerySearch constructor.
* @codeCoverageIgnore * @codeCoverageIgnore
*/ */
public function __construct() public function __construct()
{ {
Log::debug('Constructed BetterQuerySearch'); Log::debug('Constructed OperatorQuerySearch');
$this->modifiers = new Collection; // obsolete $this->modifiers = new Collection; // obsolete
$this->operators = new Collection; $this->operators = new Collection;
$this->page = 1; $this->page = 1;
@@ -231,7 +232,7 @@ class BetterQuerySearch implements SearchInterface
if ($this->updateCollector($operator, $value)) { if ($this->updateCollector($operator, $value)) {
$this->operators->push( $this->operators->push(
[ [
'type' => $operator, 'type' => $this->getRootOperator($operator),
'value' => $value, 'value' => $value,
] ]
); );
@@ -291,8 +292,8 @@ class BetterQuerySearch implements SearchInterface
$this->searchAccount($value, 1, 3); $this->searchAccount($value, 1, 3);
break; break;
case 'source_account_id': case 'source_account_id':
$account = $this->accountRepository->findNull((int)$value); $account = $this->accountRepository->findNull((int) $value);
if(null !== $account) { if (null !== $account) {
$this->collector->setSourceAccounts(new Collection([$account])); $this->collector->setSourceAccounts(new Collection([$account]));
} }
break; break;
@@ -321,14 +322,14 @@ class BetterQuerySearch implements SearchInterface
$this->searchAccount($value, 2, 3); $this->searchAccount($value, 2, 3);
break; break;
case 'destination_account_id': case 'destination_account_id':
$account = $this->accountRepository->findNull((int)$value); $account = $this->accountRepository->findNull((int) $value);
if(null !== $account) { if (null !== $account) {
$this->collector->setDestinationAccounts(new Collection([$account])); $this->collector->setDestinationAccounts(new Collection([$account]));
} }
break; break;
case 'account_id': case 'account_id':
$account = $this->accountRepository->findNull((int)$value); $account = $this->accountRepository->findNull((int) $value);
if(null !== $account) { if (null !== $account) {
$this->collector->setAccounts(new Collection([$account])); $this->collector->setAccounts(new Collection([$account]));
} }
break; break;
@@ -474,20 +475,35 @@ class BetterQuerySearch implements SearchInterface
// dates // dates
// //
case 'date_is': case 'date_is':
Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $value)); $range = $this->parseDateRange($value);
$start = new Carbon($value); Log::debug(sprintf('Set "%s" using collector with value "%s" (%s - %s)', $operator, $value, $range['start']->format('Y-m-d'), $range['end']->format('Y-m-d')));
$this->collector->setRange($start, $start); $this->collector->setRange($range['start'], $range['end']);
break;
// add to operators manually:
$this->operators->push(['type' => 'date_before', 'value' => $range['start']->format('Y-m-d'),]);
$this->operators->push(['type' => 'date_after', 'value' => $range['end']->format('Y-m-d'),]);
return false;
case 'date_before': case 'date_before':
Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $value)); $range = $this->parseDateRange($value);
$before = new Carbon($value); Log::debug(sprintf('Set "%s" using collector with value "%s" (%s - %s)', $operator, $value, $range['start']->format('Y-m-d'), $range['end']->format('Y-m-d')));
$this->collector->setBefore($before); $this->collector->setRange($range['start'], $range['end']);
break;
// add to operators manually:
$this->operators->push(['type' => 'date_before', 'value' => $range['start']->format('Y-m-d'),]);
$this->collector->setBefore($range['start']);
return false;
case 'date_after': case 'date_after':
Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $value)); $range = $this->parseDateRange($value);
$after = new Carbon($value); Log::debug(sprintf('Set "%s" using collector with value "%s" (%s - %s)', $operator, $value, $range['start']->format('Y-m-d'), $range['end']->format('Y-m-d')));
$this->collector->setAfter($after); $this->collector->setRange($range['start'], $range['end']);
break;
// add to operators manually:
$this->operators->push(['type' => 'date_before', 'value' => $range['end']->format('Y-m-d'),]);
$this->collector->setAfter($range['end']);
return false;
case 'created_on': case 'created_on':
Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $value)); Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $value));
$createdAt = new Carbon($value); $createdAt = new Carbon($value);
@@ -663,4 +679,22 @@ class BetterQuerySearch implements SearchInterface
return $operator; return $operator;
} }
/**
* @param string $value
* @return array
* @throws FireflyException
*/
private function parseDateRange(string $value): array
{
$parser = new ParseDateString;
if ($parser->isDateRange($value)) {
return $parser->parseRange($value, today(config('app.timezone')));
}
$date = $parser->parseDate($value);
return [
'start' => $date,
'end' => $date,
];
}
} }

17
app/TransactionRules/Engine/RuleEngineInterface.php
View File

@@ -28,8 +28,25 @@ use Illuminate\Support\Collection;
*/ */
interface RuleEngineInterface interface RuleEngineInterface
{ {
/**
* Add rules for the engine to execute.
*
* @param Collection $rules
*/
public function setRules(Collection $rules): void; public function setRules(Collection $rules): void;
/**
* Add entire rule groups for the engine to execute.
*
* @param Collection $ruleGroups
*/
public function setRuleGroups(Collection $ruleGroups): void; public function setRuleGroups(Collection $ruleGroups): void;
/**
* Add operators added to each search by the rule engine.
*
* @param array $operator
*/
public function addOperator(array $operator): void;
} }

30
app/TransactionRules/Engine/SearchRuleEngine.php Normal file
View File

@@ -0,0 +1,30 @@
<?php
/*
* SearchRuleEngine.php
* Copyright (c) 2020 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/>.
*/
namespace FireflyIII\TransactionRules\Engine;
/**
* Class SearchRuleEngine
*/
class SearchRuleEngine implements RuleEngineInterface
{
}

10
composer.lock generated
View File

@@ -6348,16 +6348,16 @@
}, },
{ {
"name": "tightenco/collect", "name": "tightenco/collect",
"version": "v7.19.1", "version": "v7.25.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/tightenco/collect.git", "url": "https://github.com/tightenco/collect.git",
"reference": "e070bf74564f311bb3c97e673e97ea036b38a449" "reference": "54de14fe2e8fdd0831d69601bf9c7f5e2667aa85"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/tightenco/collect/zipball/e070bf74564f311bb3c97e673e97ea036b38a449", "url": "https://api.github.com/repos/tightenco/collect/zipball/54de14fe2e8fdd0831d69601bf9c7f5e2667aa85",
"reference": "e070bf74564f311bb3c97e673e97ea036b38a449", "reference": "54de14fe2e8fdd0831d69601bf9c7f5e2667aa85",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -6394,7 +6394,7 @@
"collection", "collection",
"laravel" "laravel"
], ],
"time": "2020-07-10T22:08:24+00:00" "time": "2020-08-21T22:28:24+00:00"
}, },
{ {
"name": "tijsverkoyen/css-to-inline-styles", "name": "tijsverkoyen/css-to-inline-styles",

6
resources/lang/en_US/firefly.php
View File

@@ -280,9 +280,9 @@ return [
'search_modifier_budget' => 'Budget is ":value"', 'search_modifier_budget' => 'Budget is ":value"',
'search_modifier_bill' => 'Bill is ":value"', 'search_modifier_bill' => 'Bill is ":value"',
'search_modifier_type' => 'Transaction type is :value', 'search_modifier_type' => 'Transaction type is :value',
'search_modifier_date' => 'Transaction date is :value', 'search_modifier_date_is' => 'Transaction date is :value',
'search_modifier_date_before' => 'Transaction date is before :value', 'search_modifier_date_before' => 'Transaction date is before or on :value',
'search_modifier_date_after' => 'Transaction date is after :value', 'search_modifier_date_after' => 'Transaction date is after or on :value',
'search_modifier_on' => 'Transaction date is :value', 'search_modifier_on' => 'Transaction date is :value',
'search_modifier_before' => 'Transaction date is before :value', 'search_modifier_before' => 'Transaction date is before :value',
'search_modifier_after' => 'Transaction date is after :value', 'search_modifier_after' => 'Transaction date is after :value',

258
tests/Unit/Support/Search/BetterQuerySearchTest.php → tests/Unit/Support/Search/OperatorQuerySearchTest.php
View File

@@ -1,6 +1,6 @@
<?php <?php
/* /*
* BetterQuerySearchTest.php * OperatorQuerySearchTest.php
* Copyright (c) 2020 james@firefly-iii.org * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
@@ -24,7 +24,7 @@ namespace Tests\Unit\Support\Search;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Support\Search\BetterQuerySearch; use FireflyIII\Support\Search\OperatorQuerySearch;
use Log; use Log;
use Tests\TestCase; use Tests\TestCase;
use DB; use DB;
@@ -35,7 +35,7 @@ use DB;
* - some weird combi's * - some weird combi's
* - invalid stuff? * - invalid stuff?
*/ */
class BetterQuerySearchTest extends TestCase class OperatorQuerySearchTest extends TestCase
{ {
/** /**
* *
@@ -48,7 +48,7 @@ class BetterQuerySearchTest extends TestCase
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testParseQuery(): void public function testParseQuery(): void
{ {
@@ -190,7 +190,7 @@ class BetterQuerySearchTest extends TestCase
$query = sprintf('test %s:%s', $operator, $values[$operator]); $query = sprintf('test %s:%s', $operator, $values[$operator]);
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
try { try {
@@ -207,13 +207,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testUserAction(): void public function testUserAction(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'user_action:anything'; $query = 'user_action:anything';
@@ -237,13 +237,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testFromAccountStarts(): void public function testFromAccountStarts(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'from_account_starts:from_acct_strts_9'; $query = 'from_account_starts:from_acct_strts_9';
@@ -275,13 +275,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testAmountIs(): void public function testAmountIs(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'amount_exactly:23.45'; $query = 'amount_exactly:23.45';
@@ -313,13 +313,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testAmountLess(): void public function testAmountLess(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'amount_less:5.55'; $query = 'amount_less:5.55';
@@ -351,13 +351,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testAmountMore(): void public function testAmountMore(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'amount_more:555.55'; $query = 'amount_more:555.55';
@@ -389,13 +389,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testTransactionType(): void public function testTransactionType(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'transaction_type:withdrawal'; $query = 'transaction_type:withdrawal';
@@ -426,13 +426,13 @@ class BetterQuerySearchTest extends TestCase
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testDestinationAccountStarts(): void public function testDestinationAccountStarts(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'to_account_starts:Dest1A'; $query = 'to_account_starts:Dest1A';
@@ -464,13 +464,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testDateExact(): void public function testDateExact(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'on:2019-02-02'; $query = 'on:2019-02-02';
@@ -502,13 +502,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testDateBefore(): void public function testDateBefore(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'before:2018-02-02'; $query = 'before:2018-02-02';
@@ -540,7 +540,7 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testCreatedAt(): void public function testCreatedAt(): void
{ {
@@ -549,7 +549,7 @@ class BetterQuerySearchTest extends TestCase
// update one journal to have a very specific created_on date: // update one journal to have a very specific created_on date:
DB::table('transaction_journals')->where('id',1)->update(['created_at' => '2020-08-12 00:00:00']); DB::table('transaction_journals')->where('id',1)->update(['created_at' => '2020-08-12 00:00:00']);
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'created_at:2020-08-12'; $query = 'created_at:2020-08-12';
@@ -582,7 +582,7 @@ class BetterQuerySearchTest extends TestCase
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testUpdatedAt(): void public function testUpdatedAt(): void
{ {
@@ -591,7 +591,7 @@ class BetterQuerySearchTest extends TestCase
// update one journal to have a very specific created_on date: // update one journal to have a very specific created_on date:
DB::table('transaction_journals')->where('id',1)->update(['updated_at' => '2020-08-12 00:00:00']); DB::table('transaction_journals')->where('id',1)->update(['updated_at' => '2020-08-12 00:00:00']);
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'updated_at:2020-08-12'; $query = 'updated_at:2020-08-12';
@@ -623,7 +623,7 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testExternalId(): void public function testExternalId(): void
{ {
@@ -632,7 +632,7 @@ class BetterQuerySearchTest extends TestCase
// update one journal to have a very specific created_on date: // update one journal to have a very specific created_on date:
DB::table('transaction_journals')->where('id',1)->update(['updated_at' => '2020-08-12 00:00:00']); DB::table('transaction_journals')->where('id',1)->update(['updated_at' => '2020-08-12 00:00:00']);
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'external_id:some_ext_id'; $query = 'external_id:some_ext_id';
@@ -661,7 +661,7 @@ class BetterQuerySearchTest extends TestCase
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testInternalReference(): void public function testInternalReference(): void
{ {
@@ -670,7 +670,7 @@ class BetterQuerySearchTest extends TestCase
// update one journal to have a very specific created_on date: // update one journal to have a very specific created_on date:
DB::table('transaction_journals')->where('id',1)->update(['updated_at' => '2020-08-12 00:00:00']); DB::table('transaction_journals')->where('id',1)->update(['updated_at' => '2020-08-12 00:00:00']);
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'internal_reference:some_internal_ref'; $query = 'internal_reference:some_internal_ref';
@@ -698,13 +698,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testDateAfter(): void public function testDateAfter(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'after:2018-05-02'; $query = 'after:2018-05-02';
@@ -733,13 +733,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testDestinationAccountEnds(): void public function testDestinationAccountEnds(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'to_account_ends:3Thing'; $query = 'to_account_ends:3Thing';
@@ -771,13 +771,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testDestinationAccountContains(): void public function testDestinationAccountContains(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'to_account_contains:2Test3'; $query = 'to_account_contains:2Test3';
@@ -809,13 +809,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testDestination(): void public function testDestination(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'destination:2Test3'; $query = 'destination:2Test3';
@@ -847,13 +847,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testDestinationAccountIs(): void public function testDestinationAccountIs(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'to_account_is:Dest1Acct2Test3Thing'; $query = 'to_account_is:Dest1Acct2Test3Thing';
@@ -886,13 +886,13 @@ class BetterQuerySearchTest extends TestCase
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testHasAttachments(): void public function testHasAttachments(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'has_attachments:empty'; $query = 'has_attachments:empty';
@@ -924,13 +924,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testHasAnyCategory(): void public function testHasAnyCategory(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'has_any_category:true'; $query = 'has_any_category:true';
@@ -962,13 +962,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testHasAnyTag(): void public function testHasAnyTag(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'has_any_tag:true'; $query = 'has_any_tag:true';
@@ -1002,13 +1002,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testHasAnyBudget(): void public function testHasAnyBudget(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'has_any_budget:true'; $query = 'has_any_budget:true';
@@ -1041,13 +1041,13 @@ class BetterQuerySearchTest extends TestCase
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testCategory(): void public function testCategory(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'category:"Search cat thing"'; $query = 'category:"Search cat thing"';
@@ -1080,13 +1080,13 @@ class BetterQuerySearchTest extends TestCase
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testTag(): void public function testTag(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'tag:searchTestTag'; $query = 'tag:searchTestTag';
@@ -1120,13 +1120,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testBudget(): void public function testBudget(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'budget:"Search budget thing"'; $query = 'budget:"Search budget thing"';
@@ -1159,13 +1159,13 @@ class BetterQuerySearchTest extends TestCase
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testBill(): void public function testBill(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'bill:TestBill'; $query = 'bill:TestBill';
@@ -1197,13 +1197,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testHasNoCategory(): void public function testHasNoCategory(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'has_no_category:true'; $query = 'has_no_category:true';
@@ -1235,13 +1235,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testHasNoBudget(): void public function testHasNoBudget(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'has_no_budget:true'; $query = 'has_no_budget:true';
@@ -1273,13 +1273,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testHasNoTag(): void public function testHasNoTag(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'has_no_tag:true'; $query = 'has_no_tag:true';
@@ -1311,7 +1311,7 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testDestinationAccountIdIs(): void public function testDestinationAccountIdIs(): void
{ {
@@ -1320,7 +1320,7 @@ class BetterQuerySearchTest extends TestCase
/** @var Account $account */ /** @var Account $account */
$account = $this->user()->accounts()->where('name', 'Dest2Acct3Test4Thing')->first(); $account = $this->user()->accounts()->where('name', 'Dest2Acct3Test4Thing')->first();
$accountId = (int) $account->id; $accountId = (int) $account->id;
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = sprintf('destination_account_id:%d', $accountId); $query = sprintf('destination_account_id:%d', $accountId);
@@ -1353,7 +1353,7 @@ class BetterQuerySearchTest extends TestCase
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testSourceAccountIdIs(): void public function testSourceAccountIdIs(): void
{ {
@@ -1362,7 +1362,7 @@ class BetterQuerySearchTest extends TestCase
/** @var Account $account */ /** @var Account $account */
$account = $this->user()->accounts()->where('name', 'from_acct_NL30ABNA_test')->first(); $account = $this->user()->accounts()->where('name', 'from_acct_NL30ABNA_test')->first();
$accountId = (int) $account->id; $accountId = (int) $account->id;
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = sprintf('source_account_id:%d', $accountId); $query = sprintf('source_account_id:%d', $accountId);
@@ -1394,7 +1394,7 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testAccountIdIs(): void public function testAccountIdIs(): void
{ {
@@ -1403,7 +1403,7 @@ class BetterQuerySearchTest extends TestCase
/** @var Account $account */ /** @var Account $account */
$account = $this->user()->accounts()->where('name', 'from_acct_NL30ABNA_test')->first(); $account = $this->user()->accounts()->where('name', 'from_acct_NL30ABNA_test')->first();
$accountId = (int) $account->id; $accountId = (int) $account->id;
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = sprintf('account_id:%d', $accountId); $query = sprintf('account_id:%d', $accountId);
@@ -1435,13 +1435,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testSourceAccountNrStartsIban(): void public function testSourceAccountNrStartsIban(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'from_account_nr_starts:NL45RABO'; $query = 'from_account_nr_starts:NL45RABO';
@@ -1473,13 +1473,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testSourceAccountNrStartsNumber(): void public function testSourceAccountNrStartsNumber(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'from_account_nr_starts:NL30AB'; $query = 'from_account_nr_starts:NL30AB';
@@ -1511,13 +1511,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testSourceAccountNrEndsIban(): void public function testSourceAccountNrEndsIban(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'from_account_nr_ends:29221'; $query = 'from_account_nr_ends:29221';
@@ -1549,13 +1549,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testSourceAccountNrEndsNumber(): void public function testSourceAccountNrEndsNumber(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'from_account_nr_ends:8035321'; $query = 'from_account_nr_ends:8035321';
@@ -1588,13 +1588,13 @@ class BetterQuerySearchTest extends TestCase
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testSourceAccountNrIsIban(): void public function testSourceAccountNrIsIban(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'from_account_nr_is:NL45RABO5319829221'; $query = 'from_account_nr_is:NL45RABO5319829221';
@@ -1626,13 +1626,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testSourceAccountNrIsNumber(): void public function testSourceAccountNrIsNumber(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'from_account_nr_is:NL28ABNA1938035321'; $query = 'from_account_nr_is:NL28ABNA1938035321';
@@ -1664,13 +1664,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testSourceAccountNrContainsIban(): void public function testSourceAccountNrContainsIban(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'from_account_nr_contains:O53198'; $query = 'from_account_nr_contains:O53198';
@@ -1702,13 +1702,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testDestinationAccountNrContainsIban(): void public function testDestinationAccountNrContainsIban(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'to_account_nr_contains:L98RABO'; $query = 'to_account_nr_contains:L98RABO';
@@ -1740,13 +1740,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testDestinationAccountNrIsIban(): void public function testDestinationAccountNrIsIban(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'to_account_nr_is:NL98RABO9223011655'; $query = 'to_account_nr_is:NL98RABO9223011655';
@@ -1778,13 +1778,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testDestinationAccountNrStartsIban(): void public function testDestinationAccountNrStartsIban(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'to_account_nr_starts:NL98RABO'; $query = 'to_account_nr_starts:NL98RABO';
@@ -1816,13 +1816,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testDestinationAccountNrEndsIban(): void public function testDestinationAccountNrEndsIban(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'to_account_nr_ends:011655'; $query = 'to_account_nr_ends:011655';
@@ -1854,13 +1854,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testSourceAccountNrContainsNumber(): void public function testSourceAccountNrContainsNumber(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'from_account_nr_contains:8ABNA1'; $query = 'from_account_nr_contains:8ABNA1';
@@ -1893,13 +1893,13 @@ class BetterQuerySearchTest extends TestCase
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testSourceAccountIs(): void public function testSourceAccountIs(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'from_account_is:from_acct_strts_928_ends_Test'; $query = 'from_account_is:from_acct_strts_928_ends_Test';
@@ -1931,13 +1931,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testSourceAccountContains(): void public function testSourceAccountContains(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'from_account_contains:t_strts_928'; $query = 'from_account_contains:t_strts_928';
@@ -1969,13 +1969,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testSource(): void public function testSource(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'source:t_strts_928'; $query = 'source:t_strts_928';
@@ -2007,13 +2007,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testDescriptionStarts(): void public function testDescriptionStarts(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'description_starts:8uStartTest'; $query = 'description_starts:8uStartTest';
@@ -2045,13 +2045,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testDescriptionEnds(): void public function testDescriptionEnds(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'description_ends:22end33'; $query = 'description_ends:22end33';
@@ -2083,13 +2083,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testDescriptionContains(): void public function testDescriptionContains(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'description_contains:76tte32'; $query = 'description_contains:76tte32';
@@ -2122,13 +2122,13 @@ class BetterQuerySearchTest extends TestCase
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testNotesContain(): void public function testNotesContain(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'notes_contain:rch5No'; $query = 'notes_contain:rch5No';
@@ -2160,13 +2160,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testNotesStart(): void public function testNotesStart(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'notes_start:Test4'; $query = 'notes_start:Test4';
@@ -2198,13 +2198,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testNotesEnd(): void public function testNotesEnd(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'notes_end:6Thing'; $query = 'notes_end:6Thing';
@@ -2236,13 +2236,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testNotesAre(): void public function testNotesAre(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'notes_are:Test4Search5Notes6Thing'; $query = 'notes_are:Test4Search5Notes6Thing';
@@ -2274,13 +2274,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testAnyNotes(): void public function testAnyNotes(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'any_notes:true'; $query = 'any_notes:true';
@@ -2313,13 +2313,13 @@ class BetterQuerySearchTest extends TestCase
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testNoNotes(): void public function testNoNotes(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'no_notes:true'; $query = 'no_notes:true';
@@ -2347,13 +2347,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testDescriptionIs(): void public function testDescriptionIs(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'description_is:"Groceries descr is 3291"'; $query = 'description_is:"Groceries descr is 3291"';
@@ -2386,13 +2386,13 @@ class BetterQuerySearchTest extends TestCase
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testCurrencyIs(): void public function testCurrencyIs(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'currency_is:HUF'; $query = 'currency_is:HUF';
@@ -2424,13 +2424,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testCurrencyNameIs(): void public function testCurrencyNameIs(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'currency_is:"Hungarian forint"'; $query = 'currency_is:"Hungarian forint"';
@@ -2463,13 +2463,13 @@ class BetterQuerySearchTest extends TestCase
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testForeignCurrencyIs(): void public function testForeignCurrencyIs(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'foreign_currency_is:USD'; $query = 'foreign_currency_is:USD';
@@ -2501,13 +2501,13 @@ class BetterQuerySearchTest extends TestCase
} }
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testSourceAccountEnds(): void public function testSourceAccountEnds(): void
{ {
$this->be($this->user()); $this->be($this->user());
$object = new BetterQuerySearch; $object = new OperatorQuerySearch;
$object->setUser($this->user()); $object->setUser($this->user());
$object->setPage(1); $object->setPage(1);
$query = 'from_account_ends:28_ends_Test'; $query = 'from_account_ends:28_ends_Test';
@@ -2540,12 +2540,12 @@ class BetterQuerySearchTest extends TestCase
/** /**
* @covers \FireflyIII\Support\Search\BetterQuerySearch * @covers \FireflyIII\Support\Search\OperatorQuerySearch
*/ */
public function testGetWordsAsString(): void public function testGetWordsAsString(): void
{ {
$object = new BetterQuerySearch(); $object = new OperatorQuerySearch();
$this->assertEquals('', $object->getWordsAsString()); $this->assertEquals('', $object->getWordsAsString());
} }
} }