From 651dff0750a142cc9f629efe945575039496c6f4 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 15 Jan 2016 13:13:21 +0100 Subject: [PATCH] Shorter method names. --- .../RuleGroup/RuleGroupRepository.php | 13 ++++++------ .../RuleGroupRepositoryInterface.php | 21 ++++++++++++------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/app/Repositories/RuleGroup/RuleGroupRepository.php b/app/Repositories/RuleGroup/RuleGroupRepository.php index 9c5b3167b5..171468a6ac 100644 --- a/app/Repositories/RuleGroup/RuleGroupRepository.php +++ b/app/Repositories/RuleGroup/RuleGroupRepository.php @@ -16,7 +16,7 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface * * @return boolean */ - public function destroyRuleGroup(RuleGroup $ruleGroup, RuleGroup $moveTo = null) + public function destroy(RuleGroup $ruleGroup, RuleGroup $moveTo = null) { /** @var Rule $rule */ foreach ($ruleGroup->rules as $rule) { @@ -55,7 +55,7 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface /** * @return Collection */ - public function getRuleGroups() + public function get() { return Auth::user()->ruleGroups()->orderBy('order', 'ASC')->get(); } @@ -66,7 +66,7 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface * * @return bool */ - public function moveRuleGroupUp(RuleGroup $ruleGroup) + public function moveUp(RuleGroup $ruleGroup) { $order = $ruleGroup->order; @@ -87,7 +87,7 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface * * @return bool */ - public function moveRuleGroupDown(RuleGroup $ruleGroup) + public function moveDown(RuleGroup $ruleGroup) { $order = $ruleGroup->order; @@ -126,6 +126,7 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface /** * @param RuleGroup $ruleGroup + * * @return bool */ public function resetRulesInGroupOrder(RuleGroup $ruleGroup) @@ -153,7 +154,7 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface * * @return RuleGroup */ - public function storeRuleGroup(array $data) + public function store(array $data) { $order = $this->getHighestOrderRuleGroup(); @@ -180,7 +181,7 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface * * @return RuleGroup */ - public function updateRuleGroup(RuleGroup $ruleGroup, array $data) + public function update(RuleGroup $ruleGroup, array $data) { // update the account: $ruleGroup->title = $data['title']; diff --git a/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php b/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php index 213ab70766..060f5c5b17 100644 --- a/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php +++ b/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php @@ -6,6 +6,11 @@ namespace FireflyIII\Repositories\RuleGroup; use FireflyIII\Models\RuleGroup; use Illuminate\Support\Collection; +/** + * Interface RuleGroupRepositoryInterface + * + * @package FireflyIII\Repositories\RuleGroup + */ interface RuleGroupRepositoryInterface { /** @@ -14,8 +19,7 @@ interface RuleGroupRepositoryInterface * * @return bool */ - public function destroyRuleGroup(RuleGroup $ruleGroup, RuleGroup $moveTo = null); - + public function destroy(RuleGroup $ruleGroup, RuleGroup $moveTo = null); /** @@ -26,19 +30,21 @@ interface RuleGroupRepositoryInterface /** * @return Collection */ - public function getRuleGroups(); + public function get(); /** * @param RuleGroup $ruleGroup + * * @return bool */ - public function moveRuleGroupUp(RuleGroup $ruleGroup); + public function moveUp(RuleGroup $ruleGroup); /** * @param RuleGroup $ruleGroup + * * @return bool */ - public function moveRuleGroupDown(RuleGroup $ruleGroup); + public function moveDown(RuleGroup $ruleGroup); /** * @return bool @@ -55,8 +61,7 @@ interface RuleGroupRepositoryInterface * * @return RuleGroup */ - public function storeRuleGroup(array $data); - + public function store(array $data); /** * @param RuleGroup $ruleGroup @@ -64,7 +69,7 @@ interface RuleGroupRepositoryInterface * * @return RuleGroup */ - public function updateRuleGroup(RuleGroup $ruleGroup, array $data); + public function update(RuleGroup $ruleGroup, array $data); } \ No newline at end of file