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 clean up.

Browse Source
This commit is contained in:
James Cole
2017-11-15 10:52:29 +01:00
parent aee17221eb
commit 649dca77f5
305 changed files with 1200 additions and 1600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
app/Support/Twig/Rule.php
View File

@@ -41,18 +41,19 @@ class Rule extends Twig_Extension
public function allActionTriggers(): Twig_SimpleFunction
{
return new Twig_SimpleFunction(
'allRuleActions', function () {
// array of valid values for actions
$ruleActions = array_keys(Config::get('firefly.rule-actions'));
$possibleActions = [];
foreach ($ruleActions as $key) {
$possibleActions[$key] = trans('firefly.rule_action_' . $key . '_choice');
}
unset($key, $ruleActions);
asort($possibleActions);
'allRuleActions',
function () {
// array of valid values for actions
$ruleActions = array_keys(Config::get('firefly.rule-actions'));
$possibleActions = [];
foreach ($ruleActions as $key) {
$possibleActions[$key] = trans('firefly.rule_action_' . $key . '_choice');
}
unset($key, $ruleActions);
asort($possibleActions);
return $possibleActions;
}
return $possibleActions;
}
);
}
@@ -62,12 +63,13 @@ class Rule extends Twig_Extension
public function allJournalTriggers(): Twig_SimpleFunction
{
return new Twig_SimpleFunction(
'allJournalTriggers', function () {
return [
'allJournalTriggers',
function () {
return [
'store-journal' => trans('firefly.rule_trigger_store_journal'),
'update-journal' => trans('firefly.rule_trigger_update_journal'),
];
}
}
);
}
@@ -77,22 +79,22 @@ class Rule extends Twig_Extension
public function allRuleTriggers(): Twig_SimpleFunction
{
return new Twig_SimpleFunction(
'allRuleTriggers', function () {
$ruleTriggers = array_keys(Config::get('firefly.rule-triggers'));
$possibleTriggers = [];
foreach ($ruleTriggers as $key) {
if ($key !== 'user_action') {
$possibleTriggers[$key] = trans('firefly.rule_trigger_' . $key . '_choice');
'allRuleTriggers',
function () {
$ruleTriggers = array_keys(Config::get('firefly.rule-triggers'));
$possibleTriggers = [];
foreach ($ruleTriggers as $key) {
if ($key !== 'user_action') {
$possibleTriggers[$key] = trans('firefly.rule_trigger_' . $key . '_choice');
}
}
}
unset($key, $ruleTriggers);
asort($possibleTriggers);
unset($key, $ruleTriggers);
asort($possibleTriggers);
return $possibleTriggers;
}
return $possibleTriggers;
}
);
}
/**
@@ -105,7 +107,6 @@ class Rule extends Twig_Extension
$this->allRuleTriggers(),
$this->allActionTriggers(),
];
}
/**