Code cleanup.

app/Api/V1/Controllers/Models/TransactionCurrency/DestroyController.php

@@ -31,7 +31,6 @@ use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use Validator;
 
 /**
  * Class DestroyController
@@ -43,8 +42,6 @@ class DestroyController extends Controller
 
     /**
      * CurrencyRepository constructor.
-     *
-
      */
     public function __construct()
     {
@@ -66,9 +63,6 @@ class DestroyController extends Controller
      *
      * Remove the specified resource from storage.
      *
-     * @param TransactionCurrency $currency
-     *
-     * @return JsonResponse
      * @throws FireflyException
      */
     public function destroy(TransactionCurrency $currency): JsonResponse
@@ -80,15 +74,15 @@ class DestroyController extends Controller
         if (!$this->userRepository->hasRole($admin, 'owner')) {
             // access denied:
             $messages = ['currency_code' => '200005: You need the "owner" role to do this.'];
-            Validator::make([], $rules, $messages)->validate();
+            \Validator::make([], $rules, $messages)->validate();
         }
         if ($this->repository->currencyInUse($currency)) {
             $messages = ['currency_code' => '200006: Currency in use.'];
-            Validator::make([], $rules, $messages)->validate();
+            \Validator::make([], $rules, $messages)->validate();
         }
         if ($this->repository->isFallbackCurrency($currency)) {
             $messages = ['currency_code' => '200026: Currency is fallback.'];
-            Validator::make([], $rules, $messages)->validate();
+            \Validator::make([], $rules, $messages)->validate();
         }
 
         $this->repository->destroy($currency);

app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php

@@ -69,10 +69,6 @@ class ListController extends Controller
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/currencies/listAccountByCurrency
      * Display a list of accounts.
      *
-     * @param Request             $request
-     * @param TransactionCurrency $currency
-     *
-     * @return JsonResponse
      * @throws FireflyException
      */
     public function accounts(Request $request, TransactionCurrency $currency): JsonResponse
@@ -106,7 +102,7 @@ class ListController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.currencies.accounts', [$currency->code]) . $this->buildParams());
+        $paginator->setPath(route('api.v1.currencies.accounts', [$currency->code]).$this->buildParams());
 
         /** @var AccountTransformer $transformer */
         $transformer = app(AccountTransformer::class);
@@ -123,9 +119,6 @@ class ListController extends Controller
      *
      * Display a listing of the resource.
      *
-     * @param TransactionCurrency $currency
-     *
-     * @return JsonResponse
      * @throws FireflyException
      */
     public function availableBudgets(TransactionCurrency $currency): JsonResponse
@@ -143,7 +136,7 @@ class ListController extends Controller
         $availableBudgets = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
         // make paginator:
         $paginator = new LengthAwarePaginator($availableBudgets, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.currencies.available-budgets', [$currency->code]) . $this->buildParams());
+        $paginator->setPath(route('api.v1.currencies.available-budgets', [$currency->code]).$this->buildParams());
 
         /** @var AvailableBudgetTransformer $transformer */
         $transformer = app(AvailableBudgetTransformer::class);
@@ -161,9 +154,6 @@ class ListController extends Controller
      *
      * List all bills
      *
-     * @param TransactionCurrency $currency
-     *
-     * @return JsonResponse
      * @throws FireflyException
      */
     public function bills(TransactionCurrency $currency): JsonResponse
@@ -186,7 +176,7 @@ class ListController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.currencies.bills', [$currency->code]) . $this->buildParams());
+        $paginator->setPath(route('api.v1.currencies.bills', [$currency->code]).$this->buildParams());
 
         /** @var BillTransformer $transformer */
         $transformer = app(BillTransformer::class);
@@ -204,9 +194,6 @@ class ListController extends Controller
      *
      * List all budget limits
      *
-     * @param TransactionCurrency $currency
-     *
-     * @return JsonResponse
      * @throws FireflyException
      */
     public function budgetLimits(TransactionCurrency $currency): JsonResponse
@@ -220,7 +207,7 @@ class ListController extends Controller
         $count        = $collection->count();
         $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
         $paginator    = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.currencies.budget-limits', [$currency->code]) . $this->buildParams());
+        $paginator->setPath(route('api.v1.currencies.budget-limits', [$currency->code]).$this->buildParams());
 
         /** @var BudgetLimitTransformer $transformer */
         $transformer = app(BudgetLimitTransformer::class);
@@ -238,9 +225,6 @@ class ListController extends Controller
      *
      * List all recurring transactions.
      *
-     * @param TransactionCurrency $currency
-     *
-     * @return JsonResponse
      * @throws FireflyException
      */
     public function recurrences(TransactionCurrency $currency): JsonResponse
@@ -272,7 +256,7 @@ class ListController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.currencies.recurrences', [$currency->code]) . $this->buildParams());
+        $paginator->setPath(route('api.v1.currencies.recurrences', [$currency->code]).$this->buildParams());
 
         /** @var RecurrenceTransformer $transformer */
         $transformer = app(RecurrenceTransformer::class);
@@ -290,9 +274,6 @@ class ListController extends Controller
      *
      * List all of them.
      *
-     * @param TransactionCurrency $currency
-     *
-     * @return JsonResponse
      * @throws FireflyException
      */
     public function rules(TransactionCurrency $currency): JsonResponse
@@ -323,7 +304,7 @@ class ListController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.rules.index') . $this->buildParams());
+        $paginator->setPath(route('api.v1.rules.index').$this->buildParams());
 
         /** @var RuleTransformer $transformer */
         $transformer = app(RuleTransformer::class);
@@ -341,11 +322,6 @@ class ListController extends Controller
      *
      * Show all transactions.
      *
-     * @param Request             $request
-     *
-     * @param TransactionCurrency $currency
-     *
-     * @return JsonResponse
      * @throws FireflyException
      */
     public function transactions(Request $request, TransactionCurrency $currency): JsonResponse
@@ -374,7 +350,8 @@ class ListController extends Controller
             // set page to retrieve
             ->setPage($this->parameters->get('page'))
             // set types of transactions to return.
-            ->setTypes($types);
+            ->setTypes($types)
+        ;
         if (null !== $this->parameters->get('start')) {
             $collector->setStart($this->parameters->get('start'));
         }
@@ -382,7 +359,7 @@ class ListController extends Controller
             $collector->setEnd($this->parameters->get('end'));
         }
         $paginator = $collector->getPaginatedGroups();
-        $paginator->setPath(route('api.v1.currencies.transactions', [$currency->code]) . $this->buildParams());
+        $paginator->setPath(route('api.v1.currencies.transactions', [$currency->code]).$this->buildParams());
         $transactions = $paginator->getCollection();
 
         /** @var TransactionGroupTransformer $transformer */

app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php

@@ -34,7 +34,6 @@ use FireflyIII\Transformers\CurrencyTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Pagination\LengthAwarePaginator;
-use JsonException;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
@@ -51,8 +50,6 @@ class ShowController extends Controller
 
     /**
      * CurrencyRepository constructor.
-     *
-
      */
     public function __construct()
     {
@@ -73,9 +70,8 @@ class ShowController extends Controller
      *
      * Display a listing of the resource.
      *
-     * @return JsonResponse
      * @throws FireflyException
-     * @throws JsonException
+     * @throws \JsonException
      */
     public function index(): JsonResponse
     {
@@ -86,7 +82,7 @@ class ShowController extends Controller
         // slice them:
         $currencies = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
         $paginator  = new LengthAwarePaginator($currencies, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.currencies.index') . $this->buildParams());
+        $paginator->setPath(route('api.v1.currencies.index').$this->buildParams());
         $manager = $this->getManager();
 
         /** @var CurrencyTransformer $transformer */
@@ -105,11 +101,8 @@ class ShowController extends Controller
      *
      * Show a currency.
      *
-     * @param TransactionCurrency $currency
-     *
-     * @return JsonResponse
      * @throws FireflyException
-     * @throws JsonException
+     * @throws \JsonException
      */
     public function show(TransactionCurrency $currency): JsonResponse
     {
@@ -137,9 +130,8 @@ class ShowController extends Controller
      *
      * Show a currency.
      *
-     * @return JsonResponse
      * @throws FireflyException
-     * @throws JsonException
+     * @throws \JsonException
      */
     public function showDefault(): JsonResponse
     {

app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php

@@ -33,7 +33,6 @@ use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\CurrencyTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use JsonException;
 use League\Fractal\Resource\Item;
 
 /**
@@ -48,8 +47,6 @@ class StoreController extends Controller
 
     /**
      * CurrencyRepository constructor.
-     *
-
      */
     public function __construct()
     {
@@ -70,11 +67,8 @@ class StoreController extends Controller
      *
      * Store new currency.
      *
-     * @param StoreRequest $request
-     *
-     * @return JsonResponse
      * @throws FireflyException
-     * @throws JsonException
+     * @throws \JsonException
      */
     public function store(StoreRequest $request): JsonResponse
     {

app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php

@@ -34,7 +34,6 @@ use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\CurrencyTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use JsonException;
 use League\Fractal\Resource\Item;
 
 /**
@@ -49,8 +48,6 @@ class UpdateController extends Controller
 
     /**
      * CurrencyRepository constructor.
-     *
-
      */
     public function __construct()
     {
@@ -71,11 +68,8 @@ class UpdateController extends Controller
      *
      * Disable a currency.
      *
-     * @param TransactionCurrency $currency
-     *
-     * @return JsonResponse
      * @throws FireflyException
-     * @throws JsonException
+     * @throws \JsonException
      */
     public function disable(TransactionCurrency $currency): JsonResponse
     {
@@ -87,6 +81,7 @@ class UpdateController extends Controller
         if (1 === $this->repository->get()->count()) {
             return response()->json([], 409);
         }
+
         /** @var User $user */
         $user = auth()->user();
         $this->repository->disable($currency);
@@ -109,9 +104,6 @@ class UpdateController extends Controller
      *
      * Make the currency a default currency.
      *
-     * @param TransactionCurrency $currency
-     *
-     * @return JsonResponse
      * @throws FireflyException
      */
     public function makeDefault(TransactionCurrency $currency): JsonResponse
@@ -141,16 +133,14 @@ class UpdateController extends Controller
      *
      * Enable a currency.
      *
-     * @param TransactionCurrency $currency
-     *
-     * @return JsonResponse
      * @throws FireflyException
-     * @throws JsonException
+     * @throws \JsonException
      */
     public function enable(TransactionCurrency $currency): JsonResponse
     {
         $this->repository->enable($currency);
         $manager = $this->getManager();
+
         /** @var User $user */
         $user = auth()->user();
 
@@ -171,12 +161,8 @@ class UpdateController extends Controller
      *
      * Update a currency.
      *
-     * @param UpdateRequest       $request
-     * @param TransactionCurrency $currency
-     *
-     * @return JsonResponse
      * @throws FireflyException
-     * @throws JsonException
+     * @throws \JsonException
      */
     public function update(UpdateRequest $request, TransactionCurrency $currency): JsonResponse
     {
@@ -189,7 +175,6 @@ class UpdateController extends Controller
         $set = $this->repository->get();
         if (array_key_exists('enabled', $data) && false === $data['enabled'] && 1 === count($set) && $set->first()->id === $currency->id) {
             return response()->json([], 409);
-
         }
         $currency = $this->repository->update($currency, $data);