Various code cleanup.

app/Http/Controllers/AccountController.php

@@ -18,6 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
  */
+/** @noinspection CallableParameterUseCaseInTypeContextInspection */
 declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers;
@@ -45,7 +46,6 @@ use View;
 /**
  * Class AccountController.
  *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AccountController extends Controller
 {
@@ -76,13 +76,14 @@ class AccountController extends Controller
     }
 
     /**
-     * @param Request $request
-     * @param string  $what
+     * @param Request     $request
+     * @param string|null $what
      *
-     * @return View
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function create(Request $request, string $what = 'asset')
+    public function create(Request $request, string $what = null)
     {
+        $what            = $what ?? 'asset';
         $defaultCurrency = app('amount')->getDefaultCurrency();
         $subTitleIcon    = config('firefly.subIconsByIdentifier.' . $what);
         $subTitle        = trans('firefly.make_new_' . $what . '_account');
@@ -106,7 +107,7 @@ class AccountController extends Controller
     /**
      * @param Account $account
      *
-     * @return View
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function delete(Account $account)
     {
@@ -137,25 +138,17 @@ class AccountController extends Controller
         $this->repository->destroy($account, $moveTo);
 
         $request->session()->flash('success', (string)trans('firefly.' . $typeName . '_deleted', ['name' => $name]));
-        Preferences::mark();
+        app('preferences')->mark();
 
         return redirect($this->getPreviousUri('accounts.delete.uri'));
     }
 
     /**
-     * Edit an account.
-     *
      * @param Request                    $request
      * @param Account                    $account
-     *
      * @param AccountRepositoryInterface $repository
      *
-     * @return View
-     *
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // long and complex but not that excessively so.
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     *
-
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function edit(Request $request, Account $account, AccountRepositoryInterface $repository)
     {
@@ -214,7 +207,7 @@ class AccountController extends Controller
      * @param Request $request
      * @param string  $what
      *
-     * @return View
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function index(Request $request, string $what)
     {
@@ -255,6 +248,8 @@ class AccountController extends Controller
         return view('accounts.index', compact('what', 'subTitleIcon', 'subTitle', 'page', 'accounts'));
     }
 
+
+    /** @noinspection MoreThanThreeArgumentsInspection */
     /**
      * Show an account.
      *
@@ -312,6 +307,7 @@ class AccountController extends Controller
         );
     }
 
+
     /**
      * Show an account.
      *
@@ -364,7 +360,7 @@ class AccountController extends Controller
         $data    = $request->getAccountData();
         $account = $this->repository->store($data);
         $request->session()->flash('success', (string)trans('firefly.stored_new_account', ['name' => $account->name]));
-        Preferences::mark();
+        app('preferences')->mark();
 
         // update preferences if necessary:
         $frontPage = Preferences::get('frontPageAccounts', [])->data;
@@ -374,16 +370,16 @@ class AccountController extends Controller
             Preferences::set('frontPageAccounts', $frontPage);
             // @codeCoverageIgnoreEnd
         }
-
+        // redirect to previous URL.
+        $redirect = redirect($this->getPreviousUri('accounts.create.uri'));
         if (1 === (int)$request->get('create_another')) {
             // set value so create routine will not overwrite URL:
             $request->session()->put('accounts.create.fromStore', true);
 
-            return redirect(route('accounts.create', [$request->input('what')]))->withInput();
+            $redirect = redirect(route('accounts.create', [$request->input('what')]))->withInput();
         }
 
-        // redirect to previous URL.
-        return redirect($this->getPreviousUri('accounts.create.uri'));
+        return $redirect;
     }
 
     /**
@@ -398,17 +394,17 @@ class AccountController extends Controller
         $this->repository->update($account, $data);
 
         $request->session()->flash('success', (string)trans('firefly.updated_account', ['name' => $account->name]));
-        Preferences::mark();
+        app('preferences')->mark();
 
+        $redirect = redirect($this->getPreviousUri('accounts.edit.uri'));
         if (1 === (int)$request->get('return_to_edit')) {
             // set value so edit routine will not overwrite URL:
             $request->session()->put('accounts.edit.fromUpdate', true);
 
-            return redirect(route('accounts.edit', [$account->id]))->withInput(['return_to_edit' => 1]);
+            $redirect = redirect(route('accounts.edit', [$account->id]))->withInput(['return_to_edit' => 1]);
         }
 
-        // redirect to previous URL.
-        return redirect($this->getPreviousUri('accounts.edit.uri'));
+        return $redirect;
     }
 
     /**
@@ -419,13 +415,15 @@ class AccountController extends Controller
      */
     protected function isInArray(array $array, int $entryId)
     {
+        $result = '0';
         if (isset($array[$entryId])) {
-            return $array[$entryId];
+            $result = $array[$entryId];
         }
 
-        return '0';
+        return $result;
     }
 
+
     /**
      * This method returns "period entries", so nov-2015, dec-2015, etc etc (this depends on the users session range)
      * and for each period, the amount of money spent and earned. This is a complex operation which is cached for
@@ -437,7 +435,6 @@ class AccountController extends Controller
      *
      * @return Collection
      *
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     private function getPeriodOverview(Account $account, ?Carbon $date): Collection
     {