From 9cbfbd41dc67690b70ef522c08e2d8dc8695750e Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 15 Jan 2016 13:10:34 +0100 Subject: [PATCH] Shorter method names. --- app/Http/Controllers/RuleController.php | 16 ++++++++-------- app/Http/routes.php | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php index 05cf1be3e3..256774de3c 100644 --- a/app/Http/Controllers/RuleController.php +++ b/app/Http/Controllers/RuleController.php @@ -48,7 +48,7 @@ class RuleController extends Controller * * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ - public function storeRule(RuleFormRequest $request, RuleRepositoryInterface $repository, RuleGroup $ruleGroup) + public function store(RuleFormRequest $request, RuleRepositoryInterface $repository, RuleGroup $ruleGroup) { @@ -88,7 +88,7 @@ class RuleController extends Controller * * @return View */ - public function createRule(RuleGroup $ruleGroup) + public function create(RuleGroup $ruleGroup) { // count for possible present previous entered triggers/actions. $triggerCount = 0; @@ -162,7 +162,7 @@ class RuleController extends Controller * * @return View */ - public function editRule(Rule $rule) + public function edit(Rule $rule) { // count for current rule's triggers/actions. @@ -296,7 +296,7 @@ class RuleController extends Controller * * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ - public function updateRule(RuleRepositoryInterface $repository, RuleFormRequest $request, Rule $rule) + public function update(RuleRepositoryInterface $repository, RuleFormRequest $request, Rule $rule) { // process the rule itself: @@ -335,7 +335,7 @@ class RuleController extends Controller * @return View * @internal param RuleRepositoryInterface $repository */ - public function deleteRule(Rule $rule) + public function delete(Rule $rule) { $subTitle = trans('firefly.delete_rule', ['title' => $rule->title]); @@ -354,7 +354,7 @@ class RuleController extends Controller * * @return \Illuminate\Http\RedirectResponse */ - public function destroyRule(RuleRepositoryInterface $repository, Rule $rule) + public function destroy(RuleRepositoryInterface $repository, Rule $rule) { $title = $rule->title; @@ -437,7 +437,7 @@ class RuleController extends Controller * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ - public function upRule(RuleRepositoryInterface $repository, Rule $rule) + public function up(RuleRepositoryInterface $repository, Rule $rule) { $repository->moveRuleUp($rule); @@ -451,7 +451,7 @@ class RuleController extends Controller * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ - public function downRule(RuleRepositoryInterface $repository, Rule $rule) + public function down(RuleRepositoryInterface $repository, Rule $rule) { $repository->moveRuleDown($rule); diff --git a/app/Http/routes.php b/app/Http/routes.php index 69d7b901d9..1b513bb540 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -240,18 +240,18 @@ Route::group( Route::get('/rules', ['uses' => 'RuleController@index', 'as' => 'rules.index']); // rules GET: - Route::get('/rules/create/{ruleGroup}', ['uses' => 'RuleController@createRule', 'as' => 'rules.rule.create']); - Route::get('/rules/rules/up/{rule}', ['uses' => 'RuleController@upRule', 'as' => 'rules.rule.up']); - Route::get('/rules/rules/down/{rule}', ['uses' => 'RuleController@downRule', 'as' => 'rules.rule.down']); - Route::get('/rules/rules/edit/{rule}', ['uses' => 'RuleController@editRule', 'as' => 'rules.rule.edit']); - Route::get('/rules/rules/delete/{rule}', ['uses' => 'RuleController@deleteRule', 'as' => 'rules.rule.delete']); + Route::get('/rules/create/{ruleGroup}', ['uses' => 'RuleController@create', 'as' => 'rules.rule.create']); + Route::get('/rules/rules/up/{rule}', ['uses' => 'RuleController@up', 'as' => 'rules.rule.up']); + Route::get('/rules/rules/down/{rule}', ['uses' => 'RuleController@down', 'as' => 'rules.rule.down']); + Route::get('/rules/rules/edit/{rule}', ['uses' => 'RuleController@edit', 'as' => 'rules.rule.edit']); + Route::get('/rules/rules/delete/{rule}', ['uses' => 'RuleController@delete', 'as' => 'rules.rule.delete']); // rules POST: Route::post('/rules/rules/trigger/reorder/{rule}', ['uses' => 'RuleController@reorderRuleTriggers']); Route::post('/rules/rules/action/reorder/{rule}', ['uses' => 'RuleController@reorderRuleActions']); - Route::post('/rules/store/{ruleGroup}', ['uses' => 'RuleController@storeRule', 'as' => 'rules.rule.store']); - Route::post('/rules/update/{rule}', ['uses' => 'RuleController@updateRule', 'as' => 'rules.rule.update']); - Route::post('/rules/destroy/{rule}', ['uses' => 'RuleController@destroyRule', 'as' => 'rules.rule.destroy']); + Route::post('/rules/store/{ruleGroup}', ['uses' => 'RuleController@store', 'as' => 'rules.rule.store']); + Route::post('/rules/update/{rule}', ['uses' => 'RuleController@update', 'as' => 'rules.rule.update']); + Route::post('/rules/destroy/{rule}', ['uses' => 'RuleController@destroy', 'as' => 'rules.rule.destroy']); // rule groups GET