Code cleanup.

app/Http/Controllers/Rule/CreateController.php

@@ -52,8 +52,6 @@ class CreateController extends Controller
 
     /**
      * RuleController constructor.
-     *
-
      */
     public function __construct()
     {
@@ -74,10 +72,8 @@ class CreateController extends Controller
     /**
      * Create a new rule. It will be stored under the given $ruleGroup.
      *
-     * @param Request        $request
-     * @param RuleGroup|null $ruleGroup
-     *
      * @return Factory|View
+     *
      * @throws FireflyException
      */
     public function create(Request $request, RuleGroup $ruleGroup = null)
@@ -105,7 +101,7 @@ class CreateController extends Controller
             }
             $oldTriggers = $this->parseFromOperators($operators);
         }
-        //var_dump($oldTriggers);exit;
+        // var_dump($oldTriggers);exit;
 
         // restore actions and triggers from old input:
         if (is_array($request->old()) && count($request->old()) > 0) {
@@ -141,10 +137,8 @@ class CreateController extends Controller
     /**
      * Create a new rule. It will be stored under the given $ruleGroup.
      *
-     * @param Request $request
-     * @param Bill    $bill
-     *
      * @return Factory|View
+     *
      * @throws FireflyException
      */
     public function createFromBill(Request $request, Bill $bill)
@@ -193,10 +187,8 @@ class CreateController extends Controller
     }
 
     /**
-     * @param Request            $request
-     * @param TransactionJournal $journal
-     *
      * @return Factory|\Illuminate\Contracts\View\View
+     *
      * @throws FireflyException
      */
     public function createFromJournal(Request $request, TransactionJournal $journal)
@@ -243,11 +235,6 @@ class CreateController extends Controller
         );
     }
 
-    /**
-     * @param Request $request
-     *
-     * @return JsonResponse
-     */
     public function duplicate(Request $request): JsonResponse
     {
         $ruleId = (int)$request->get('id');
@@ -262,10 +249,7 @@ class CreateController extends Controller
     /**
      * Store the new rule.
      *
-     * @param RuleFormRequest $request
-     *
-     * @return RedirectResponse|Redirector
-     *
+     * @return Redirector|RedirectResponse
      */
     public function store(RuleFormRequest $request)
     {

app/Http/Controllers/Rule/DeleteController.php

@@ -40,8 +40,6 @@ class DeleteController extends Controller
 
     /**
      * RuleController constructor.
-     *
-
      */
     public function __construct()
     {
@@ -62,8 +60,6 @@ class DeleteController extends Controller
     /**
      * Delete a given rule.
      *
-     * @param Rule $rule
-     *
      * @return Factory|View
      */
     public function delete(Rule $rule)
@@ -78,10 +74,6 @@ class DeleteController extends Controller
 
     /**
      * Actually destroy the given rule.
-     *
-     * @param Rule $rule
-     *
-     * @return RedirectResponse
      */
     public function destroy(Rule $rule): RedirectResponse
     {

app/Http/Controllers/Rule/EditController.php

@@ -37,7 +37,6 @@ use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
 use Illuminate\View\View;
-use Throwable;
 
 /**
  * Class EditController
@@ -51,8 +50,6 @@ class EditController extends Controller
 
     /**
      * RuleController constructor.
-     *
-
      */
     public function __construct()
     {
@@ -73,10 +70,8 @@ class EditController extends Controller
     /**
      * Edit a rule.
      *
-     * @param Request $request
-     * @param Rule    $rule
-     *
      * @return Factory|View
+     *
      * @throws FireflyException
      */
     public function edit(Request $request, Rule $rule)
@@ -120,7 +115,6 @@ class EditController extends Controller
             'active'          => $hasOldInput ? (bool)$request->old('active') : $rule->active,
             'stop_processing' => $hasOldInput ? (bool)$request->old('stop_processing') : $rule->stop_processing,
             'strict'          => $hasOldInput ? (bool)$request->old('strict') : $rule->strict,
-
         ];
 
         // get rule trigger for update / store-journal:
@@ -139,9 +133,29 @@ class EditController extends Controller
     }
 
     /**
-     * @param array $submittedOperators
+     * Update the rule.
      *
-     * @return array
+     * @return Redirector|RedirectResponse
+     */
+    public function update(RuleFormRequest $request, Rule $rule)
+    {
+        $data = $request->getRuleData();
+
+        $this->ruleRepos->update($rule, $data);
+
+        session()->flash('success', (string)trans('firefly.updated_rule', ['title' => $rule->title]));
+        app('preferences')->mark();
+        $redirect = redirect($this->getPreviousUrl('rules.edit.url'));
+        if (1 === (int)$request->get('return_to_edit')) {
+            session()->put('rules.edit.fromUpdate', true);
+
+            $redirect = redirect(route('rules.edit', [$rule->id]))->withInput(['return_to_edit' => 1]);
+        }
+
+        return $redirect;
+    }
+
+    /**
      * @throws FireflyException
      */
     private function parseFromOperators(array $submittedOperators): array
@@ -170,41 +184,16 @@ class EditController extends Controller
                         'triggers'   => $triggers,
                     ]
                 )->render();
-            } catch (Throwable $e) {
+            } catch (\Throwable $e) {
                 $message = sprintf('Throwable was thrown in getPreviousTriggers(): %s', $e->getMessage());
                 app('log')->debug($message);
                 app('log')->error($e->getTraceAsString());
+
                 throw new FireflyException($message, 0, $e);
             }
-            $index++;
+            ++$index;
         }
 
         return $renderedEntries;
     }
-
-    /**
-     * Update the rule.
-     *
-     * @param RuleFormRequest $request
-     * @param Rule            $rule
-     *
-     * @return RedirectResponse|Redirector
-     */
-    public function update(RuleFormRequest $request, Rule $rule)
-    {
-        $data = $request->getRuleData();
-
-        $this->ruleRepos->update($rule, $data);
-
-        session()->flash('success', (string)trans('firefly.updated_rule', ['title' => $rule->title]));
-        app('preferences')->mark();
-        $redirect = redirect($this->getPreviousUrl('rules.edit.url'));
-        if (1 === (int)$request->get('return_to_edit')) {
-            session()->put('rules.edit.fromUpdate', true);
-
-            $redirect = redirect(route('rules.edit', [$rule->id]))->withInput(['return_to_edit' => 1]);
-        }
-
-        return $redirect;
-    }
 }

app/Http/Controllers/Rule/IndexController.php

@@ -47,8 +47,6 @@ class IndexController extends Controller
 
     /**
      * RuleController constructor.
-     *
-
      */
     public function __construct()
     {
@@ -79,13 +77,6 @@ class IndexController extends Controller
         return view('rules.index', compact('ruleGroups'));
     }
 
-    /**
-     * @param Request   $request
-     * @param Rule      $rule
-     * @param RuleGroup $ruleGroup
-     *
-     * @return JsonResponse
-     */
     public function moveRule(Request $request, Rule $rule, RuleGroup $ruleGroup): JsonResponse
     {
         $order = (int)$request->get('order');
@@ -94,11 +85,6 @@ class IndexController extends Controller
         return response()->json([]);
     }
 
-    /**
-     * @param Rule $rule
-     *
-     * @return RedirectResponse
-     */
     public function search(Rule $rule): RedirectResponse
     {
         $route = route('search.index');

app/Http/Controllers/Rule/SelectController.php

@@ -32,18 +32,15 @@ use FireflyIII\Models\Rule;
 use FireflyIII\Models\RuleTrigger;
 use FireflyIII\Support\Http\Controllers\RuleManagement;
 use FireflyIII\TransactionRules\Engine\RuleEngineInterface;
-use FireflyIII\TransactionRules\TransactionMatcher;
 use FireflyIII\User;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Collection;
 use Illuminate\View\View;
-use Throwable;
 
 /**
  * Class SelectController.
- *
  */
 class SelectController extends Controller
 {
@@ -68,11 +65,6 @@ class SelectController extends Controller
 
     /**
      * Execute the given rule on a set of existing transactions.
-     *
-     * @param SelectTransactionsRequest $request
-     * @param Rule                      $rule
-     *
-     * @return RedirectResponse
      */
     public function execute(SelectTransactionsRequest $request, Rule $rule): RedirectResponse
     {
@@ -104,12 +96,8 @@ class SelectController extends Controller
 
     /**
      * View to select transactions by a rule.
-     *
-     * @param Rule $rule
-     *
-     * @return Factory|View|RedirectResponse
      */
-    public function selectTransactions(Rule $rule): Factory | View | RedirectResponse
+    public function selectTransactions(Rule $rule): Factory|RedirectResponse|View
     {
         if (false === $rule->active) {
             session()->flash('warning', trans('firefly.cannot_fire_inactive_rules'));
@@ -128,15 +116,13 @@ class SelectController extends Controller
      * This method allows the user to test a certain set of rule triggers. The rule triggers are passed along
      * using the URL parameters (GET), and are usually put there using a Javascript thing.
      *
-     * @param TestRuleFormRequest $request
-     *
-     * @return JsonResponse
      * @throws FireflyException
      */
     public function testTriggers(TestRuleFormRequest $request): JsonResponse
     {
         // build fake rule
         $rule = new Rule();
+
         /** @var \Illuminate\Database\Eloquent\Collection<int, RuleTrigger> $triggers */
         $triggers     = new Collection();
         $rule->strict = '1' === $request->get('strict');
@@ -180,12 +166,14 @@ class SelectController extends Controller
 
         // Return json response
         $view = 'ERROR, see logs.';
+
         try {
             $view = view('list.journals-array-tiny', ['groups' => $collection])->render();
-        } catch (Throwable $exception) {
+        } catch (\Throwable $exception) {
             app('log')->error(sprintf('Could not render view in testTriggers(): %s', $exception->getMessage()));
             app('log')->error($exception->getTraceAsString());
             $view = sprintf('Could not render list.journals-tiny: %s', $exception->getMessage());
+
             throw new FireflyException($view, 0, $exception);
         }
 
@@ -196,9 +184,6 @@ class SelectController extends Controller
      * This method allows the user to test a certain set of rule triggers. The rule triggers are grabbed from
      * the rule itself.
      *
-     * @param Rule $rule
-     *
-     * @return JsonResponse
      * @throws FireflyException
      */
     public function testTriggersByRule(Rule $rule): JsonResponse
@@ -223,12 +208,14 @@ class SelectController extends Controller
 
         // Return json response
         $view = 'ERROR, see logs.';
+
         try {
             $view = view('list.journals-array-tiny', ['groups' => $collection])->render();
-        } catch (Throwable $exception) {
+        } catch (\Throwable $exception) {
             $message = sprintf('Could not render view in testTriggersByRule(): %s', $exception->getMessage());
             app('log')->error($message);
             app('log')->error($exception->getTraceAsString());
+
             throw new FireflyException($message, 0, $exception);
         }