kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-06 22:21:42 +00:00
Code Issues Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
James Cole
2016-01-15 13:13:33 +01:00
parent 651dff0750
commit 01792f91e2
6 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Repositories/Rule/RuleRepository.php
View File

@@ -14,7 +14,6 @@ use FireflyIII\Models\Rule;
use FireflyIII\Models\RuleAction;
use FireflyIII\Models\RuleGroup;
use FireflyIII\Models\RuleTrigger;
use Illuminate\Support\Collection;
/**
* Class RuleRepository
@@ -48,6 +47,7 @@ class RuleRepository implements RuleRepositoryInterface
/**
* @param RuleGroup $ruleGroup
*
* @return bool
*/
public function resetRulesInGroupOrder(RuleGroup $ruleGroup)
@@ -98,7 +98,7 @@ class RuleRepository implements RuleRepositoryInterface
*
* @return bool
*/
public function moveRuleUp(Rule $rule)
public function moveUp(Rule $rule)
{
$order = $rule->order;
@@ -119,7 +119,7 @@ class RuleRepository implements RuleRepositoryInterface
*
* @return bool
*/
public function moveRuleDown(Rule $rule)
public function moveDown(Rule $rule)
{
$order = $rule->order;
@@ -142,7 +142,7 @@ class RuleRepository implements RuleRepositoryInterface
*
* @return Rule
*/
public function storeRule(array $data)
public function store(array $data)
{
/** @var RuleGroup $ruleGroup */
$ruleGroup = Auth::user()->ruleGroups()->find($data['rule_group_id']);
@@ -213,7 +213,7 @@ class RuleRepository implements RuleRepositoryInterface
*
* @return bool
*/
public function destroyRule(Rule $rule)
public function destroy(Rule $rule)
{
foreach ($rule->ruleTriggers as $trigger) {
$trigger->delete();
@@ -264,9 +264,10 @@ class RuleRepository implements RuleRepositoryInterface
/**
* @param Rule $rule
* @param array $data
*
* @return Rule
*/
public function updateRule(Rule $rule, array $data)
public function update(Rule $rule, array $data)
{
// update rule:
$rule->active = $data['active'];

17
app/Repositories/Rule/RuleRepositoryInterface.php
View File

@@ -13,7 +13,6 @@ use FireflyIII\Models\Rule;
use FireflyIII\Models\RuleAction;
use FireflyIII\Models\RuleGroup;
use FireflyIII\Models\RuleTrigger;
use Illuminate\Support\Collection;
/**
* Interface RuleRepositoryInterface
@@ -27,7 +26,7 @@ interface RuleRepositoryInterface
*
* @return bool
*/
public function destroyRule(Rule $rule);
public function destroy(Rule $rule);
/**
* @param RuleGroup $ruleGroup
@@ -39,6 +38,7 @@ interface RuleRepositoryInterface
/**
* @param Rule $rule
* @param array $ids
*
* @return bool
*/
public function reorderRuleTriggers(Rule $rule, array $ids);
@@ -46,41 +46,46 @@ interface RuleRepositoryInterface
/**
* @param Rule $rule
* @param array $ids
*
* @return bool
*/
public function reorderRuleActions(Rule $rule, array $ids);
/**
* @param RuleGroup $ruleGroup
*
* @return bool
*/
public function resetRulesInGroupOrder(RuleGroup $ruleGroup);
/**
* @param Rule $rule
*
* @return bool
*/
public function moveRuleUp(Rule $rule);
public function moveUp(Rule $rule);
/**
* @param Rule $rule
* @param array $data
*
* @return Rule
*/
public function updateRule(Rule $rule, array $data);
public function update(Rule $rule, array $data);
/**
* @param Rule $rule
*
* @return bool
*/
public function moveRuleDown(Rule $rule);
public function moveDown(Rule $rule);
/**
* @param array $data
*
* @return Rule
*/
public function storeRule(array $data);
public function store(array $data);
/**
* @param Rule $rule