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

Code cleanup.

Browse Source
This commit is contained in:
James Cole
2016-04-26 21:40:15 +02:00
parent 1d2a4e707e
commit da202317c0
41 changed files with 167 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Requests/AccountFormRequest.php
View File

@@ -4,7 +4,6 @@ declare(strict_types = 1);
namespace FireflyIII\Http\Requests;
use Auth;
use Config;
use FireflyIII\Models\Account;
use Input;
@@ -30,9 +29,9 @@ class AccountFormRequest extends Request
*/
public function rules()
{
$accountRoles = join(',', array_keys(Config::get('firefly.accountRoles')));
$types = join(',', array_keys(Config::get('firefly.subTitlesByIdentifier')));
$ccPaymentTypes = join(',', array_keys(Config::get('firefly.ccTypes')));
$accountRoles = join(',', array_keys(config('firefly.accountRoles')));
$types = join(',', array_keys(config('firefly.subTitlesByIdentifier')));
$ccPaymentTypes = join(',', array_keys(config('firefly.ccTypes')));
$nameRule = 'required|min:1|uniqueAccountForUser';
$idRule = '';

7
app/Http/Requests/RuleFormRequest.php
View File

@@ -11,7 +11,6 @@ declare(strict_types = 1);
namespace FireflyIII\Http\Requests;
use Auth;
use Config;
use FireflyIII\Models\RuleGroup;
use Input;
@@ -38,11 +37,11 @@ class RuleFormRequest extends Request
public function rules()
{
$validTriggers = array_keys(Config::get('firefly.rule-triggers'));
$validActions = array_keys(Config::get('firefly.rule-actions'));
$validTriggers = array_keys(config('firefly.rule-triggers'));
$validActions = array_keys(config('firefly.rule-actions'));
// some actions require text:
$contextActions = join(',', Config::get('firefly.rule-actions-text'));
$contextActions = join(',', config('firefly.rule-actions-text'));
$titleRule = 'required|between:1,100|uniqueObjectForUser:rule_groups,title';
if (RuleGroup::find(Input::get('id'))) {

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

@@ -20,7 +20,6 @@ declare(strict_types = 1);
namespace FireflyIII\Http\Requests;
use Auth;
use Config;
/**
* Class RuleFormRequest
@@ -45,7 +44,7 @@ class TestRuleFormRequest extends Request
public function rules()
{
$validTriggers = array_keys(Config::get('firefly.rule-triggers'));
$validTriggers = array_keys(config('firefly.rule-triggers'));
$rules = [
'rule-trigger.*' => 'required|min:1|in:' . join(',', $validTriggers),
'rule-trigger-value.*' => 'required|min:1|ruleTriggerValue',