kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-20 16:40:10 +00:00
Code Issues Projects Releases Wiki Activity

Rule engine and search engine now use the same operators; making them interchangeable.

Browse Source
This commit is contained in:
James Cole
2020-08-21 08:23:44 +02:00
parent 3081911eae
commit d69934ca8f
11 changed files with 141 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Requests/TestRuleFormRequest.php
View File

@@ -22,6 +22,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Requests;
use FireflyIII\Support\Request\GetRuleConfiguration;
use Illuminate\Foundation\Http\FormRequest;
/**
@@ -31,6 +32,7 @@ use Illuminate\Foundation\Http\FormRequest;
*/
class TestRuleFormRequest extends FormRequest
{
use GetRuleConfiguration;
/**
* Verify the request.
*
@@ -51,7 +53,7 @@ class TestRuleFormRequest extends FormRequest
public function rules(): array
{
// fixed
$validTriggers = array_keys(config('firefly.rule-triggers'));
$validTriggers = $this->getTriggers();
$rules = [
'rule-trigger.*' => 'required|min:1|in:' . implode(',', $validTriggers),
'rule-trigger-value.*' => 'required|min:1|ruleTriggerValue',