Fix formatting and interfaces in nearly every file

2018-03-19 20:50:40 -05:00
parent 04c5b9e7bf
commit ccf56ddec1
331 changed files with 3282 additions and 2492 deletions
--- a/app/Http/Controllers/Admin/AircraftController.php
+++ b/app/Http/Controllers/Admin/AircraftController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin;

 use App\Http\Requests\CreateAircraftRequest;
 use App\Http\Requests\UpdateAircraftRequest;
+use App\Interfaces\Controller;
 use App\Models\Aircraft;
 use App\Models\Enums\AircraftStatus;
 use App\Models\Expense;
@@ -13,8 +14,11 @@ use Flash;
 use Illuminate\Http\Request;
 use Prettus\Repository\Criteria\RequestCriteria;

-
-class AircraftController extends BaseController
+/**
+ * Class AircraftController
+ * @package App\Http\Controllers\Admin
+ */
+class AircraftController extends Controller
 {
    private $aircraftRepo;

@@ -49,7 +53,7 @@ class AircraftController extends BaseController
    {
        return view('admin.aircraft.create', [
            'subfleets' => Subfleet::all()->pluck('name', 'id'),
-            'statuses' => AircraftStatus::select(true),
+            'statuses'  => AircraftStatus::select(true),
        ]);
    }

@@ -63,6 +67,7 @@ class AircraftController extends BaseController
        $aircraft = $this->aircraftRepo->create($attrs);

        Flash::success('Aircraft saved successfully.');
+
        return redirect(route('admin.aircraft.edit', ['id' => $aircraft->id]));
    }

@@ -75,11 +80,12 @@ class AircraftController extends BaseController

        if (empty($aircraft)) {
            Flash::error('Aircraft not found');
+
            return redirect(route('admin.aircraft.index'));
        }

        return view('admin.aircraft.show', [
-            'aircraft'    => $aircraft,
+            'aircraft' => $aircraft,
        ]);
    }

@@ -92,12 +98,13 @@ class AircraftController extends BaseController

        if (empty($aircraft)) {
            Flash::error('Aircraft not found');
+
            return redirect(route('admin.aircraft.index'));
        }

        return view('admin.aircraft.edit', [
            'subfleets' => Subfleet::all()->pluck('name', 'id'),
-            'statuses' => AircraftStatus::select(true),
+            'statuses'  => AircraftStatus::select(true),
            'aircraft'  => $aircraft,
        ]);
    }
@@ -112,6 +119,7 @@ class AircraftController extends BaseController

        if (empty($aircraft)) {
            Flash::error('Aircraft not found');
+
            return redirect(route('admin.aircraft.index'));
        }

@@ -119,6 +127,7 @@ class AircraftController extends BaseController
        $this->aircraftRepo->update($attrs, $id);

        Flash::success('Aircraft updated successfully.');
+
        return redirect(route('admin.aircraft.index'));
    }

@@ -131,12 +140,14 @@ class AircraftController extends BaseController

        if (empty($aircraft)) {
            Flash::error('Aircraft not found');
+
            return redirect(route('admin.aircraft.index'));
        }

        $this->aircraftRepo->delete($id);

        Flash::success('Aircraft deleted successfully.');
+
        return redirect(route('admin.aircraft.index'));
    }

@@ -147,6 +158,7 @@ class AircraftController extends BaseController
    protected function return_expenses_view(?Aircraft $aircraft)
    {
        $aircraft->refresh();
+
        return view('admin.aircraft.expenses', [
            'aircraft' => $aircraft,
        ]);
@@ -154,7 +166,7 @@ class AircraftController extends BaseController

    /**
     * Operations for associating ranks to the subfleet
-     * @param $id
+     * @param         $id
     * @param Request $request
     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
     * @throws \Exception
--- a/app/Http/Controllers/Admin/AirlinesController.php
+++ b/app/Http/Controllers/Admin/AirlinesController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin;

 use App\Http\Requests\CreateAirlineRequest;
 use App\Http\Requests\UpdateAirlineRequest;
+use App\Interfaces\Controller;
 use App\Repositories\AirlineRepository;
 use App\Support\Countries;
 use Flash;
@@ -11,9 +12,12 @@ use Illuminate\Http\Request;
 use Prettus\Repository\Criteria\RequestCriteria;
 use Response;

-class AirlinesController extends BaseController
+/**
+ * Class AirlinesController
+ * @package App\Http\Controllers\Admin
+ */
+class AirlinesController extends Controller
 {
-    /** @var  AirlineRepository */
    private $airlineRepo;

    /**
@@ -59,6 +63,7 @@ class AirlinesController extends BaseController
        $airlines = $this->airlineRepo->create($input);

        Flash::success('Airlines saved successfully.');
+
        return redirect(route('admin.airlines.index'));
    }

@@ -73,6 +78,7 @@ class AirlinesController extends BaseController

        if (empty($airlines)) {
            Flash::error('Airlines not found');
+
            return redirect(route('admin.airlines.index'));
        }

@@ -92,18 +98,19 @@ class AirlinesController extends BaseController

        if (empty($airline)) {
            Flash::error('Airline not found');
+
            return redirect(route('admin.airlines.index'));
        }

        return view('admin.airlines.edit', [
-            'airline' => $airline,
+            'airline'   => $airline,
            'countries' => Countries::getSelectList(),
        ]);
    }

    /**
     * Update the specified Airlines in storage.
-     * @param  int $id
+     * @param  int                 $id
     * @param UpdateAirlineRequest $request
     * @return Response
     * @throws \Prettus\Validator\Exceptions\ValidatorException
@@ -114,6 +121,7 @@ class AirlinesController extends BaseController

        if (empty($airlines)) {
            Flash::error('Airlines not found');
+
            return redirect(route('admin.airlines.index'));
        }

@@ -135,12 +143,14 @@ class AirlinesController extends BaseController

        if (empty($airlines)) {
            Flash::error('Airlines not found');
+
            return redirect(route('admin.airlines.index'));
        }

        $this->airlineRepo->delete($id);

        Flash::success('Airlines deleted successfully.');
+
        return redirect(route('admin.airlines.index'));
    }
 }
--- a/app/Http/Controllers/Admin/AirportController.php
+++ b/app/Http/Controllers/Admin/AirportController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin;

 use App\Http\Requests\CreateAirportRequest;
 use App\Http\Requests\UpdateAirportRequest;
+use App\Interfaces\Controller;
 use App\Models\Airport;
 use App\Models\Expense;
 use App\Repositories\AirportRepository;
@@ -13,14 +14,15 @@ use Illuminate\Http\Request;
 use Jackiedo\Timezonelist\Facades\Timezonelist;
 use Response;

-
-class AirportController extends BaseController
+/**
+ * Class AirportController
+ * @package App\Http\Controllers\Admin
+ */
+class AirportController extends Controller
 {
-    /** @var  AirportRepository */
    private $airportRepo;

    /**
-     * AirportController constructor.
     * @param AirportRepository $airportRepo
     */
    public function __construct(
@@ -38,14 +40,14 @@ class AirportController extends BaseController
    public function index(Request $request)
    {
        $where = [];
-        if($request->has('icao')) {
+        if ($request->has('icao')) {
            $where['icao'] = $request->get('icao');
        }

        $this->airportRepo->pushCriteria(new WhereCriteria($request, $where));
        $airports = $this->airportRepo
-                         ->orderBy('icao', 'asc')
-                         ->paginate();
+            ->orderBy('icao', 'asc')
+            ->paginate();

        return view('admin.airports.index', [
            'airports' => $airports,
@@ -77,6 +79,7 @@ class AirportController extends BaseController
        $this->airportRepo->create($input);

        Flash::success('Airport saved successfully.');
+
        return redirect(route('admin.airports.index'));
    }

@@ -91,6 +94,7 @@ class AirportController extends BaseController

        if (empty($airport)) {
            Flash::error('Airport not found');
+
            return redirect(route('admin.airports.index'));
        }

@@ -110,18 +114,19 @@ class AirportController extends BaseController

        if (empty($airport)) {
            Flash::error('Airport not found');
+
            return redirect(route('admin.airports.index'));
        }

        return view('admin.airports.edit', [
            'timezones' => Timezonelist::toArray(),
-            'airport' => $airport,
+            'airport'   => $airport,
        ]);
    }

    /**
     * Update the specified Airport in storage.
-     * @param  int $id
+     * @param  int                 $id
     * @param UpdateAirportRequest $request
     * @return Response
     * @throws \Prettus\Validator\Exceptions\ValidatorException
@@ -132,6 +137,7 @@ class AirportController extends BaseController

        if (empty($airport)) {
            Flash::error('Airport not found');
+
            return redirect(route('admin.airports.index'));
        }

@@ -141,6 +147,7 @@ class AirportController extends BaseController
        $this->airportRepo->update($attrs, $id);

        Flash::success('Airport updated successfully.');
+
        return redirect(route('admin.airports.index'));
    }

@@ -155,12 +162,14 @@ class AirportController extends BaseController

        if (empty($airport)) {
            Flash::error('Airport not found');
+
            return redirect(route('admin.airports.index'));
        }

        $this->airportRepo->delete($id);

        Flash::success('Airport deleted successfully.');
+
        return redirect(route('admin.airports.index'));
    }

@@ -171,6 +180,7 @@ class AirportController extends BaseController
    protected function return_expenses_view(?Airport $airport)
    {
        $airport->refresh();
+
        return view('admin.airports.expenses', [
            'airport' => $airport,
        ]);
@@ -178,7 +188,7 @@ class AirportController extends BaseController

    /**
     * Operations for associating ranks to the subfleet
-     * @param $id
+     * @param         $id
     * @param Request $request
     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
     * @throws \Exception
@@ -224,6 +234,7 @@ class AirportController extends BaseController
        $airport = $this->airportRepo->findWithoutFail($id);
        if (empty($airport)) {
            Flash::error('Flight not found');
+
            return redirect(route('admin.flights.index'));
        }

--- a/app/Http/Controllers/Admin/AwardController.php
+++ b/app/Http/Controllers/Admin/AwardController.php
@@ -4,19 +4,25 @@ namespace App\Http\Controllers\Admin;

 use App\Http\Requests\CreateAwardRequest;
 use App\Http\Requests\UpdateAwardRequest;
+use App\Interfaces\Controller;
 use App\Repositories\AwardRepository;
 use App\Services\AwardService;
-use Illuminate\Http\Request;
 use Flash;
+use Illuminate\Http\Request;
 use Prettus\Repository\Criteria\RequestCriteria;
 use Response;

-class AwardController extends BaseController
+class AwardController extends Controller
 {
    /** @var  AwardRepository */
    private $awardRepository,
-            $awardSvc;
+        $awardSvc;

+    /**
+     * AwardController constructor.
+     * @param AwardRepository $awardRepo
+     * @param AwardService    $awardSvc
+     */
    public function __construct(
        AwardRepository $awardRepo,
        AwardService $awardSvc
@@ -38,13 +44,13 @@ class AwardController extends BaseController
        $descriptions = [];

        $award_classes = $this->awardSvc->findAllAwardClasses();
-        foreach($award_classes as $class_ref => $award) {
+        foreach ($award_classes as $class_ref => $award) {
            $awards[$class_ref] = $award->name;
            $descriptions[$class_ref] = $award->param_description;
        }

        return [
-            'awards' => $awards,
+            'awards'       => $awards,
            'descriptions' => $descriptions,
        ];
    }
@@ -72,8 +78,9 @@ class AwardController extends BaseController
    public function create()
    {
        $class_refs = $this->getAwardClassesAndDescriptions();
+
        return view('admin.awards.create', [
-            'award_classes' => $class_refs['awards'],
+            'award_classes'      => $class_refs['awards'],
            'award_descriptions' => $class_refs['descriptions'],
        ]);
    }
@@ -103,6 +110,7 @@ class AwardController extends BaseController
        $award = $this->awardRepository->findWithoutFail($id);
        if (empty($award)) {
            Flash::error('Award not found');
+
            return redirect(route('admin.awards.index'));
        }

@@ -121,20 +129,22 @@ class AwardController extends BaseController
        $award = $this->awardRepository->findWithoutFail($id);
        if (empty($award)) {
            Flash::error('Award not found');
+
            return redirect(route('admin.awards.index'));
        }

        $class_refs = $this->getAwardClassesAndDescriptions();
+
        return view('admin.awards.edit', [
-            'award' => $award,
-            'award_classes' => $class_refs['awards'],
+            'award'              => $award,
+            'award_classes'      => $class_refs['awards'],
            'award_descriptions' => $class_refs['descriptions'],
        ]);
    }

    /**
     * Update the specified award in storage.
-     * @param  int $id
+     * @param  int               $id
     * @param UpdateAwardRequest $request
     * @return Response
     * @throws \Prettus\Validator\Exceptions\ValidatorException
@@ -144,6 +154,7 @@ class AwardController extends BaseController
        $award = $this->awardRepository->findWithoutFail($id);
        if (empty($award)) {
            Flash::error('Award not found');
+
            return redirect(route('admin.awards.index'));
        }

@@ -165,6 +176,7 @@ class AwardController extends BaseController
        $award = $this->awardRepository->findWithoutFail($id);
        if (empty($award)) {
            Flash::error('Fare not found');
+
            return redirect(route('admin.awards.index'));
        }

--- a/app/Http/Controllers/Admin/BaseController.php
+++ b/app/Http/Controllers/Admin/BaseController.php
@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Admin;
-
-use App\Http\Controllers\Controller;
-use Response;
-
-
-class BaseController extends Controller
-{
-
-}
--- a/app/Http/Controllers/Admin/DashboardController.php
+++ b/app/Http/Controllers/Admin/DashboardController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Admin;

 use App\Facades\Utils;
+use App\Interfaces\Controller;
 use App\Repositories\NewsRepository;
 use App\Repositories\PirepRepository;
 use App\Repositories\UserRepository;
@@ -13,15 +14,21 @@ use Log;
 use Version;
 use vierbergenlars\SemVer\version as semver;

-class DashboardController extends BaseController
+/**
+ * Class DashboardController
+ * @package App\Http\Controllers\Admin
+ */
+class DashboardController extends Controller
 {
-    private $newsRepo, $pirepRepo, $userRepo;
+    private $newsRepo,
+            $pirepRepo,
+            $userRepo;

    /**
     * DashboardController constructor.
-     * @param NewsRepository $newsRepo
+     * @param NewsRepository  $newsRepo
     * @param PirepRepository $pirepRepo
-     * @param UserRepository $userRepo
+     * @param UserRepository  $userRepo
     */
    public function __construct(
        NewsRepository $newsRepo,
@@ -46,7 +53,7 @@ class DashboardController extends BaseController
            $latest_version = new semver(Utils::downloadUrl(config('phpvms.version_file')));

            if (semver::gt($latest_version, $current_version)) {
-                Flash::warning('New version ' . $latest_version . ' is available!');
+                Flash::warning('New version '.$latest_version.' is available!');
            }
        } catch (\Exception $e) {
            Log::error($e->getMessage());
@@ -63,9 +70,9 @@ class DashboardController extends BaseController
        $this->checkNewVersion();

        return view('admin.dashboard.index', [
-            'news' => $this->newsRepo->getLatest(),
+            'news'           => $this->newsRepo->getLatest(),
            'pending_pireps' => $this->pirepRepo->getPendingCount(),
-            'pending_users' => $this->userRepo->getPendingCount(),
+            'pending_users'  => $this->userRepo->getPendingCount(),
        ]);
    }

@@ -76,7 +83,7 @@ class DashboardController extends BaseController
     */
    public function news(Request $request)
    {
-        if($request->isMethod('post')) {
+        if ($request->isMethod('post')) {
            $attrs = $request->post();
            $attrs['user_id'] = Auth::user()->id;

--- a/app/Http/Controllers/Admin/ExpenseController.php
+++ b/app/Http/Controllers/Admin/ExpenseController.php
@@ -2,8 +2,7 @@

 namespace App\Http\Controllers\Admin;

-use App\Http\Requests\CreateAirlineRequest;
-use App\Http\Requests\UpdateAirlineRequest;
+use App\Interfaces\Controller;
 use App\Models\Enums\ExpenseType;
 use App\Models\Expense;
 use App\Repositories\AirlineRepository;
@@ -13,7 +12,11 @@ use Illuminate\Http\Request;
 use Prettus\Repository\Criteria\RequestCriteria;
 use Response;

-class ExpenseController extends BaseController
+/**
+ * Class ExpenseController
+ * @package App\Http\Controllers\Admin
+ */
+class ExpenseController extends Controller
 {
    private $airlineRepo,
            $expenseRepo;
@@ -73,6 +76,7 @@ class ExpenseController extends BaseController
        $this->expenseRepo->create($input);

        Flash::success('Expense saved successfully.');
+
        return redirect(route('admin.expenses.index'));
    }

@@ -87,6 +91,7 @@ class ExpenseController extends BaseController

        if (empty($expenses)) {
            Flash::error('expenses not found');
+
            return redirect(route('admin.expenses.index'));
        }

@@ -106,11 +111,12 @@ class ExpenseController extends BaseController

        if (empty($expense)) {
            Flash::error('Expense not found');
+
            return redirect(route('admin.expenses.index'));
        }

        return view('admin.expenses.edit', [
-            'expense' => $expense,
+            'expense'       => $expense,
            'airlines_list' => $this->airlineRepo->selectBoxList(true),
            'expense_types' => ExpenseType::select(),
        ]);
@@ -118,7 +124,7 @@ class ExpenseController extends BaseController

    /**
     * Update the specified expenses in storage.
-     * @param  int $id
+     * @param  int    $id
     * @param Request $request
     * @return Response
     * @throws \Prettus\Validator\Exceptions\ValidatorException
@@ -129,12 +135,14 @@ class ExpenseController extends BaseController

        if (empty($expenses)) {
            Flash::error('Expense not found');
+
            return redirect(route('admin.expenses.index'));
        }

        $this->expenseRepo->update($request->all(), $id);

        Flash::success('Expense updated successfully.');
+
        return redirect(route('admin.expenses.index'));
    }

@@ -149,12 +157,14 @@ class ExpenseController extends BaseController

        if (empty($expenses)) {
            Flash::error('Expense not found');
+
            return redirect(route('admin.expenses.index'));
        }

        $this->expenseRepo->delete($id);

        Flash::success('Expense deleted successfully.');
+
        return redirect(route('admin.expenses.index'));
    }
 }
--- a/app/Http/Controllers/Admin/FareController.php
+++ b/app/Http/Controllers/Admin/FareController.php
@@ -4,15 +4,19 @@ namespace App\Http\Controllers\Admin;

 use App\Http\Requests\CreateFareRequest;
 use App\Http\Requests\UpdateFareRequest;
+use App\Interfaces\Controller;
 use App\Repositories\FareRepository;
 use Flash;
 use Illuminate\Http\Request;
 use Prettus\Repository\Criteria\RequestCriteria;
 use Response;

-class FareController extends BaseController
+/**
+ * Class FareController
+ * @package App\Http\Controllers\Admin
+ */
+class FareController extends Controller
 {
-    /** @var  FareRepository */
    private $fareRepository;

    /**
@@ -75,6 +79,7 @@ class FareController extends BaseController
        $fare = $this->fareRepository->findWithoutFail($id);
        if (empty($fare)) {
            Flash::error('Fare not found');
+
            return redirect(route('admin.fares.index'));
        }

@@ -91,6 +96,7 @@ class FareController extends BaseController
        $fare = $this->fareRepository->findWithoutFail($id);
        if (empty($fare)) {
            Flash::error('Fare not found');
+
            return redirect(route('admin.fares.index'));
        }

@@ -99,7 +105,7 @@ class FareController extends BaseController

    /**
     * Update the specified Fare in storage.
-     * @param  int $id
+     * @param  int              $id
     * @param UpdateFareRequest $request
     * @return Response
     * @throws \Prettus\Validator\Exceptions\ValidatorException
@@ -109,6 +115,7 @@ class FareController extends BaseController
        $fare = $this->fareRepository->findWithoutFail($id);
        if (empty($fare)) {
            Flash::error('Fare not found');
+
            return redirect(route('admin.fares.index'));
        }

@@ -128,6 +135,7 @@ class FareController extends BaseController
        $fare = $this->fareRepository->findWithoutFail($id);
        if (empty($fare)) {
            Flash::error('Fare not found');
+
            return redirect(route('admin.fares.index'));
        }

--- a/app/Http/Controllers/Admin/FinanceController.php
+++ b/app/Http/Controllers/Admin/FinanceController.php
@@ -2,12 +2,11 @@

 namespace App\Http\Controllers\Admin;

+use App\Interfaces\Controller;
 use App\Models\Enums\JournalType;
 use App\Models\Journal;
 use App\Models\JournalTransaction;
 use App\Repositories\AirlineRepository;
-use App\Repositories\JournalRepository;
-use App\Services\Finance\PirepFinanceService;
 use App\Support\Dates;
 use App\Support\Money;
 use Illuminate\Http\Request;
@@ -16,25 +15,17 @@ use Illuminate\Http\Request;
 * Class FinanceController
 * @package App\Http\Controllers\Admin
 */
-class FinanceController extends BaseController
+class FinanceController extends Controller
 {
-    private $airlineRepo,
-            $financeSvc,
-            $journalRepo;
+    private $airlineRepo;

    /**
-     * @param AirlineRepository $airlineRepo
-     * @param PirepFinanceService $financeSvc
-     * @param JournalRepository $journalRepo
+     * @param AirlineRepository   $airlineRepo
     */
    public function __construct(
-        AirlineRepository $airlineRepo,
-        PirepFinanceService $financeSvc,
-        JournalRepository $journalRepo
+        AirlineRepository $airlineRepo
    ) {
        $this->airlineRepo = $airlineRepo;
-        $this->financeSvc = $financeSvc;
-        $this->journalRepo = $journalRepo;
    }

    /**
@@ -58,8 +49,7 @@ class FinanceController extends BaseController
        $airlines = $this->airlineRepo->orderBy('icao')->all();

        # group by the airline
-        foreach($airlines as $airline) {
-
+        foreach ($airlines as $airline) {
            # Return all the transactions, grouped by the transaction group
            $transactions = JournalTransaction::groupBy('transaction_group')
                ->selectRaw('transaction_group, currency, 
@@ -83,16 +73,16 @@ class FinanceController extends BaseController
            }

            $transaction_groups[] = [
-                'airline'       => $airline,
-                'credits'       => new Money($sum_all_credits),
-                'debits'        => new Money($sum_all_debits),
-                'transactions'  => $transactions,
+                'airline'      => $airline,
+                'credits'      => new Money($sum_all_credits),
+                'debits'       => new Money($sum_all_debits),
+                'transactions' => $transactions,
            ];
        }

        return view('admin.finances.index', [
-            'current_month' => $month,
-            'months_list' => Dates::getMonthsList($first_journal->created_at),
+            'current_month'      => $month,
+            'months_list'        => Dates::getMonthsList($first_journal->created_at),
            'transaction_groups' => $transaction_groups,
        ]);
    }
@@ -102,6 +92,5 @@ class FinanceController extends BaseController
     */
    public function show($id)
    {
-
    }
 }
--- a/app/Http/Controllers/Admin/FlightController.php
+++ b/app/Http/Controllers/Admin/FlightController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin;

 use App\Http\Requests\CreateFlightRequest;
 use App\Http\Requests\UpdateFlightRequest;
+use App\Interfaces\Controller;
 use App\Models\Enums\FlightType;
 use App\Models\Flight;
 use App\Models\FlightFields;
@@ -19,7 +20,11 @@ use Flash;
 use Illuminate\Http\Request;
 use Response;

-class FlightController extends BaseController
+/**
+ * Class FlightController
+ * @package App\Http\Controllers\Admin
+ */
+class FlightController extends Controller
 {
    private $airlineRepo,
            $airportRepo,
@@ -31,12 +36,12 @@ class FlightController extends BaseController

    /**
     * FlightController constructor.
-     * @param AirlineRepository $airlineRepo
-     * @param AirportRepository $airportRepo
-     * @param FareRepository $fareRepo
-     * @param FlightRepository $flightRepo
-     * @param FareService $fareSvc
-     * @param FlightService $flightSvc
+     * @param AirlineRepository  $airlineRepo
+     * @param AirportRepository  $airportRepo
+     * @param FareRepository     $fareRepo
+     * @param FlightRepository   $flightRepo
+     * @param FareService        $fareSvc
+     * @param FlightService      $flightSvc
     * @param SubfleetRepository $subfleetRepo
     */
    public function __construct(
@@ -84,8 +89,9 @@ class FlightController extends BaseController
    public function index(Request $request)
    {
        $flights = $this->flightRepo->searchCriteria($request, false)->paginate();
+
        return view('admin.flights.index', [
-            'flights' => $flights,
+            'flights'  => $flights,
            'airlines' => $this->airlineRepo->selectBoxList(true),
            'airports' => $this->airportRepo->selectBoxList(true),
        ]);
@@ -98,9 +104,9 @@ class FlightController extends BaseController
    public function create()
    {
        return view('admin.flights.create', [
-            'flight'   => null,
-            'airlines' => $this->airlineRepo->selectBoxList(),
-            'airports' => $this->airportRepo->selectBoxList(true, false),
+            'flight'       => null,
+            'airlines'     => $this->airlineRepo->selectBoxList(),
+            'airports'     => $this->airportRepo->selectBoxList(true, false),
            'alt_airports' => $this->airportRepo->selectBoxList(true),
            'flight_types' => FlightType::select(true),
        ]);
@@ -120,17 +126,18 @@ class FlightController extends BaseController
            'flight_number' => $input['flight_number'],
        ];

-        if(filled($input['route_code'])) {
+        if (filled($input['route_code'])) {
            $where['route_code'] = $input['route_code'];
        }

-        if(filled($input['route_leg'])) {
+        if (filled($input['route_leg'])) {
            $where['route_leg'] = $input['route_leg'];
        }

        $flights = $this->flightRepo->findWhere($where);
-        if($flights->count() > 0) {
+        if ($flights->count() > 0) {
            Flash::error('Duplicate flight with same number/code/leg found, please change to proceed');
+
            return redirect()->back()->withInput($request->all());
        }

@@ -142,6 +149,7 @@ class FlightController extends BaseController
        $flight = $this->flightRepo->create($input);

        Flash::success('Flight saved successfully.');
+
        return redirect(route('admin.flights.edit', $flight->id));
    }

@@ -155,12 +163,14 @@ class FlightController extends BaseController

        if (empty($flight)) {
            Flash::error('Flight not found');
+
            return redirect(route('admin.flights.index'));
        }

        $avail_subfleets = $this->getAvailSubfleets($flight);
+
        return view('admin.flights.show', [
-            'flight' => $flight,
+            'flight'          => $flight,
            'avail_subfleets' => $avail_subfleets,
        ]);
    }
@@ -174,6 +184,7 @@ class FlightController extends BaseController
        $flight = $this->flightRepo->findWithoutFail($id);
        if (empty($flight)) {
            Flash::error('Flight not found');
+
            return redirect(route('admin.flights.index'));
        }

@@ -183,18 +194,18 @@ class FlightController extends BaseController
        $flight->minutes = $time->minutes;

        return view('admin.flights.edit', [
-            'flight' => $flight,
-            'airlines' => $this->airlineRepo->selectBoxList(),
-            'airports' => $this->airportRepo->selectBoxList(),
-            'alt_airports' => $this->airportRepo->selectBoxList(true),
-            'avail_fares' => $this->getAvailFares($flight),
+            'flight'          => $flight,
+            'airlines'        => $this->airlineRepo->selectBoxList(),
+            'airports'        => $this->airportRepo->selectBoxList(),
+            'alt_airports'    => $this->airportRepo->selectBoxList(true),
+            'avail_fares'     => $this->getAvailFares($flight),
            'avail_subfleets' => $this->getAvailSubfleets($flight),
-            'flight_types' => FlightType::select(true),
+            'flight_types'    => FlightType::select(true),
        ]);
    }

    /**
-     * @param $id
+     * @param                     $id
     * @param UpdateFlightRequest $request
     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
     * @throws \Prettus\Validator\Exceptions\ValidatorException
@@ -205,6 +216,7 @@ class FlightController extends BaseController

        if (empty($flight)) {
            Flash::error('Flight not found');
+
            return redirect(route('admin.flights.index'));
        }

@@ -227,6 +239,7 @@ class FlightController extends BaseController
        $flights = $this->flightRepo->findWhere($where);
        if ($flights->count() > 0) {
            Flash::error('Duplicate flight with same number/code/leg found, please change to proceed');
+
            return redirect()->back()->withInput($request->all());
        }

@@ -239,6 +252,7 @@ class FlightController extends BaseController
        $this->flightRepo->update($input, $id);

        Flash::success('Flight updated successfully.');
+
        return redirect(route('admin.flights.index'));
    }

@@ -253,12 +267,14 @@ class FlightController extends BaseController

        if (empty($flight)) {
            Flash::error('Flight not found');
+
            return redirect(route('admin.flights.index'));
        }

        $this->flightSvc->deleteFlight($flight);

        Flash::success('Flight deleted successfully.');
+
        return redirect(route('admin.flights.index'));
    }

@@ -269,6 +285,7 @@ class FlightController extends BaseController
    protected function return_fields_view($flight)
    {
        $flight->refresh();
+
        return view('admin.flights.flight_fields', [
            'flight' => $flight,
        ]);
@@ -285,6 +302,7 @@ class FlightController extends BaseController
        $flight = $this->flightRepo->findWithoutFail($id);
        if (empty($flight)) {
            Flash::error('Flight not found');
+
            return redirect(route('admin.flights.index'));
        }

@@ -295,16 +313,12 @@ class FlightController extends BaseController
            $field->name = $request->name;
            $field->value = $request->value;
            $field->save();
-        }
-
-        elseif ($request->isMethod('put')) {
+        } elseif ($request->isMethod('put')) {
            $field = FlightFields::where('id', $request->field_id)->first();
            $field->value = $request->value;
            $field->save();
            // update the field value
-        }
-
-        // remove custom field from flight
+        } // remove custom field from flight
        elseif ($request->isMethod('delete')) {
            FlightFields::destroy($request->field_id);
        }
@@ -319,14 +333,15 @@ class FlightController extends BaseController
    protected function return_subfleet_view($flight)
    {
        $avail_subfleets = $this->getAvailSubfleets($flight);
+
        return view('admin.flights.subfleets', [
-            'flight' => $flight,
+            'flight'          => $flight,
            'avail_subfleets' => $avail_subfleets,
        ]);
    }

    /**
-     * @param $id
+     * @param         $id
     * @param Request $request
     * @return mixed
     */
@@ -335,15 +350,14 @@ class FlightController extends BaseController
        $flight = $this->flightRepo->findWithoutFail($id);
        if (empty($flight)) {
            Flash::error('Flight not found');
+
            return redirect(route('admin.flights.index'));
        }

        // add aircraft to flight
        if ($request->isMethod('post')) {
            $flight->subfleets()->syncWithoutDetaching([$request->subfleet_id]);
-        }
-
-        // remove aircraft from flight
+        } // remove aircraft from flight
        elseif ($request->isMethod('delete')) {
            $flight->subfleets()->detach($request->subfleet_id);
        }
@@ -360,7 +374,7 @@ class FlightController extends BaseController
        $all_fares = $this->fareRepo->all();
        $avail_fares = $all_fares->except($flight->fares->modelKeys());
        foreach ($avail_fares as $fare) {
-            $retval[$fare->id] = $fare->name .
+            $retval[$fare->id] = $fare->name.
                ' (base price: '.$fare->price.')';
        }

@@ -374,8 +388,9 @@ class FlightController extends BaseController
    protected function return_fares_view(Flight $flight)
    {
        $flight->refresh();
+
        return view('admin.flights.fares', [
-            'flight' => $flight,
+            'flight'      => $flight,
            'avail_fares' => $this->getAvailFares($flight),
        ]);
    }
@@ -400,6 +415,7 @@ class FlightController extends BaseController
        if ($request->isMethod('delete')) {
            $fare = $this->fareRepo->findWithoutFail($request->fare_id);
            $this->fareSvc->delFareFromFlight($flight, $fare);
+
            return $this->return_fares_view($flight);
        }

--- a/app/Http/Controllers/Admin/PirepController.php
+++ b/app/Http/Controllers/Admin/PirepController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Admin;
 use App\Facades\Utils;
 use App\Http\Requests\CreatePirepRequest;
 use App\Http\Requests\UpdatePirepRequest;
+use App\Interfaces\Controller;
 use App\Models\Enums\PirepSource;
 use App\Models\Enums\PirepState;
 use App\Models\Pirep;
@@ -27,8 +28,11 @@ use Log;
 use Prettus\Repository\Criteria\RequestCriteria;
 use Response;

-
-class PirepController extends BaseController
+/**
+ * Class PirepController
+ * @package App\Http\Controllers\Admin
+ */
+class PirepController extends Controller
 {
    private $airportRepo,
            $airlineRepo,
@@ -43,16 +47,16 @@ class PirepController extends BaseController

    /**
     * PirepController constructor.
-     * @param AirportRepository $airportRepo
-     * @param AirlineRepository $airlineRepo
-     * @param AircraftRepository $aircraftRepo
-     * @param FareService $fareSvc
-     * @param JournalRepository $journalRepo
-     * @param PirepRepository $pirepRepo
+     * @param AirportRepository    $airportRepo
+     * @param AirlineRepository    $airlineRepo
+     * @param AircraftRepository   $aircraftRepo
+     * @param FareService          $fareSvc
+     * @param JournalRepository    $journalRepo
+     * @param PirepRepository      $pirepRepo
     * @param PirepFieldRepository $pirepFieldRepo
-     * @param PirepService $pirepSvc
-     * @param SubfleetRepository $subfleetRepo
-     * @param UserService $userSvc
+     * @param PirepService         $pirepSvc
+     * @param SubfleetRepository   $subfleetRepo
+     * @param UserService          $userSvc
     */
    public function __construct(
        AirportRepository $airportRepo,
@@ -83,11 +87,11 @@ class PirepController extends BaseController
     * @param null $user
     * @return array
     */
-    public function aircraftList($user=null)
+    public function aircraftList($user = null)
    {
        $aircraft = [];

-        if($user === null) {
+        if ($user === null) {
            $subfleets = $this->subfleetRepo->all();
        } else {
            $subfleets = $this->userSvc->getAllowableSubfleets($user);
@@ -96,7 +100,7 @@ class PirepController extends BaseController
        foreach ($subfleets as $subfleet) {
            $tmp = [];
            foreach ($subfleet->aircraft as $ac) {
-                $tmp[$ac->id] = $ac['name'] . ' - ' . $ac['registration'];
+                $tmp[$ac->id] = $ac['name'].' - '.$ac['registration'];
            }

            $aircraft[$subfleet->name] = $tmp;
@@ -107,7 +111,7 @@ class PirepController extends BaseController

    /**
     * Save any custom fields found
-     * @param Pirep $pirep
+     * @param Pirep   $pirep
     * @param Request $request
     */
    protected function saveCustomFields(Pirep $pirep, Request $request)
@@ -120,8 +124,8 @@ class PirepController extends BaseController
            }

            $custom_fields[] = [
-                'name' => $field->name,
-                'value' => $request->input($field->slug),
+                'name'   => $field->name,
+                'value'  => $request->input($field->slug),
                'source' => PirepSource::MANUAL
            ];
        }
@@ -132,7 +136,7 @@ class PirepController extends BaseController

    /**
     * Save the fares that have been specified/saved
-     * @param Pirep $pirep
+     * @param Pirep   $pirep
     * @param Request $request
     * @throws \Exception
     */
@@ -140,8 +144,7 @@ class PirepController extends BaseController
    {
        $fares = [];
        foreach ($pirep->aircraft->subfleet->fares as $fare) {
-
-            $field_name = 'fare_' . $fare->id;
+            $field_name = 'fare_'.$fare->id;
            if (!$request->filled($field_name)) {
                $count = 0;
            } else {
@@ -150,7 +153,7 @@ class PirepController extends BaseController

            $fares[] = [
                'fare_id' => $fare->id,
-                'count' => $count,
+                'count'   => $count,
            ];
        }

@@ -171,7 +174,7 @@ class PirepController extends BaseController
        Log::info('aircraft', $aircraft->toArray());

        return view('admin.pireps.fares', [
-            'aircraft' => $aircraft,
+            'aircraft'  => $aircraft,
            'read_only' => false,
        ]);
    }
@@ -187,8 +190,8 @@ class PirepController extends BaseController
        $this->pirepRepo->pushCriteria($criterea);

        $pireps = $this->pirepRepo
-                       ->orderBy('created_at', 'desc')
-                       ->paginate();
+            ->orderBy('created_at', 'desc')
+            ->paginate();

        return view('admin.pireps.index', [
            'pireps' => $pireps
@@ -247,6 +250,7 @@ class PirepController extends BaseController
        $this->saveFares($pirep, $request);

        Flash::success('Pirep saved successfully.');
+
        return redirect(route('admin.pireps.index'));
    }

@@ -261,6 +265,7 @@ class PirepController extends BaseController

        if (empty($pirep)) {
            Flash::error('Pirep not found');
+
            return redirect(route('admin.pireps.index'));
        }

@@ -280,6 +285,7 @@ class PirepController extends BaseController
        $pirep = $this->pirepRepo->findWithoutFail($id);
        if (empty($pirep)) {
            Flash::error('Pirep not found');
+
            return redirect(route('admin.pireps.index'));
        }

@@ -297,25 +303,25 @@ class PirepController extends BaseController

        # set the fares
        foreach ($pirep->fares as $fare) {
-            $field_name = 'fare_' . $fare->fare_id;
+            $field_name = 'fare_'.$fare->fare_id;
            $pirep->{$field_name} = $fare->count;
        }

        $journal = $this->journalRepo->getAllForObject($pirep, $pirep->airline->journal);

        return view('admin.pireps.edit', [
-            'pirep' => $pirep,
-            'read_only' => $read_only,
-            'aircraft' => $pirep->aircraft,
+            'pirep'         => $pirep,
+            'read_only'     => $read_only,
+            'aircraft'      => $pirep->aircraft,
            'aircraft_list' => $this->aircraftList(),
            'airports_list' => $this->airportRepo->selectBoxList(),
            'airlines_list' => $this->airlineRepo->selectBoxList(),
-            'journal' => $journal,
+            'journal'       => $journal,
        ]);
    }

    /**
-     * @param $id
+     * @param                    $id
     * @param UpdatePirepRequest $request
     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
     * @throws \Prettus\Validator\Exceptions\ValidatorException
@@ -327,6 +333,7 @@ class PirepController extends BaseController

        if (empty($pirep)) {
            Flash::error('Pirep not found');
+
            return redirect(route('admin.pireps.index'));
        }

@@ -343,7 +350,7 @@ class PirepController extends BaseController
        $pirep = $this->pirepRepo->update($attrs, $id);

        // A route change in the PIREP, so update the saved points in the ACARS table
-        if($pirep->route !== $orig_route) {
+        if ($pirep->route !== $orig_route) {
            $this->pirepSvc->saveRoute($pirep);
        }

@@ -351,6 +358,7 @@ class PirepController extends BaseController
        $this->saveFares($pirep, $request);

        Flash::success('Pirep updated successfully.');
+
        return redirect(route('admin.pireps.index'));
    }

@@ -365,12 +373,14 @@ class PirepController extends BaseController

        if (empty($pirep)) {
            Flash::error('Pirep not found');
+
            return redirect(route('admin.pireps.index'));
        }

        $this->pirepRepo->delete($id);

        Flash::success('Pirep deleted successfully.');
+
        return redirect(route('admin.pireps.index'));
    }

@@ -384,18 +394,19 @@ class PirepController extends BaseController
        Log::info('PIREP state update call', [$request->toArray()]);

        $pirep = $this->pirepRepo->findWithoutFail($request->id);
-        if($request->isMethod('post')) {
+        if ($request->isMethod('post')) {
            $new_status = (int) $request->post('new_status');
            $pirep = $this->pirepSvc->changeState($pirep, $new_status);
        }

        $pirep->refresh();
+
        return view('admin.pireps.actions', ['pirep' => $pirep, 'on_edit_page' => false]);
    }

    /**
     * Add a comment to the Pirep
-     * @param $id
+     * @param         $id
     * @param Request $request
     * @return mixed
     * @throws \Exception
@@ -406,16 +417,16 @@ class PirepController extends BaseController
        $pirep = $this->pirepRepo->findWithoutFail($request->id);
        if ($request->isMethod('post')) {
            $comment = new PirepComment([
-                'user_id' => $user->id,
+                'user_id'  => $user->id,
                'pirep_id' => $pirep->id,
-                'comment' => $request->get('comment'),
+                'comment'  => $request->get('comment'),
            ]);

            $comment->save();
            $pirep->refresh();
        }

-        if($request->isMethod('delete')) {
+        if ($request->isMethod('delete')) {
            $comment = PirepComment::find($request->get('comment_id'));
            $comment->delete();
            $pirep->refresh();
--- a/app/Http/Controllers/Admin/PirepFieldController.php
+++ b/app/Http/Controllers/Admin/PirepFieldController.php
@@ -4,15 +4,19 @@ namespace App\Http\Controllers\Admin;

 use App\Http\Requests\CreatePirepFieldRequest;
 use App\Http\Requests\UpdatePirepFieldRequest;
+use App\Interfaces\Controller;
 use App\Repositories\PirepFieldRepository;
 use Flash;
 use Illuminate\Http\Request;
 use Prettus\Repository\Criteria\RequestCriteria;
 use Response;

-class PirepFieldController extends BaseController
+/**
+ * Class PirepFieldController
+ * @package App\Http\Controllers\Admin
+ */
+class PirepFieldController extends Controller
 {
-    /** @var  PirepFieldRepository */
    private $pirepFieldRepo;

    /**
@@ -21,7 +25,7 @@ class PirepFieldController extends BaseController
     */
    public function __construct(
        PirepFieldRepository $pirepFieldRepo
-    ){
+    ) {
        $this->pirepFieldRepo = $pirepFieldRepo;
    }

@@ -65,6 +69,7 @@ class PirepFieldController extends BaseController
        $this->pirepFieldRepo->create($attrs);

        Flash::success('Field added successfully.');
+
        return redirect(route('admin.pirepfields.index'));
    }

@@ -79,6 +84,7 @@ class PirepFieldController extends BaseController

        if (empty($field)) {
            Flash::error('PirepField not found');
+
            return redirect(route('admin.pirepfields.index'));
        }

@@ -98,6 +104,7 @@ class PirepFieldController extends BaseController

        if (empty($field)) {
            Flash::error('Field not found');
+
            return redirect(route('admin.pirepfields.index'));
        }

@@ -116,6 +123,7 @@ class PirepFieldController extends BaseController

        if (empty($field)) {
            Flash::error('PirepField not found');
+
            return redirect(route('admin.pirepfields.index'));
        }

@@ -125,6 +133,7 @@ class PirepFieldController extends BaseController
        $this->pirepFieldRepo->update($attrs, $id);

        Flash::success('Field updated successfully.');
+
        return redirect(route('admin.pirepfields.index'));
    }

@@ -139,12 +148,14 @@ class PirepFieldController extends BaseController

        if (empty($field)) {
            Flash::error('Field not found');
+
            return redirect(route('admin.pirepfields.index'));
        }

        $this->pirepFieldRepo->delete($id);

        Flash::success('Field deleted successfully.');
+
        return redirect(route('admin.pirepfields.index'));
    }
 }
--- a/app/Http/Controllers/Admin/RankController.php
+++ b/app/Http/Controllers/Admin/RankController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin;

 use App\Http\Requests\CreateRankRequest;
 use App\Http\Requests\UpdateRankRequest;
+use App\Interfaces\Controller;
 use App\Repositories\RankRepository;
 use App\Repositories\SubfleetRepository;
 use App\Services\FleetService;
@@ -13,17 +14,20 @@ use Illuminate\Http\Request;
 use Prettus\Repository\Criteria\RequestCriteria;
 use Response;

-class RankController extends BaseController
+/**
+ * Class RankController
+ * @package App\Http\Controllers\Admin
+ */
+class RankController extends Controller
 {
-    /** @var  RankRepository */
    private $fleetSvc,
            $rankRepository,
            $subfleetRepo;

    /**
     * RankController constructor.
-     * @param FleetService $fleetSvc
-     * @param RankRepository $rankingRepo
+     * @param FleetService       $fleetSvc
+     * @param RankRepository     $rankingRepo
     * @param SubfleetRepository $subfleetRepo
     */
    public function __construct(
@@ -109,6 +113,7 @@ class RankController extends BaseController

        if (empty($rank)) {
            Flash::error('Ranking not found');
+
            return redirect(route('admin.ranks.index'));
        }

@@ -128,19 +133,21 @@ class RankController extends BaseController

        if (empty($rank)) {
            Flash::error('Ranking not found');
+
            return redirect(route('admin.ranks.index'));
        }

        $avail_subfleets = $this->getAvailSubfleets($rank);
+
        return view('admin.ranks.edit', [
-            'rank' => $rank,
+            'rank'            => $rank,
            'avail_subfleets' => $avail_subfleets,
        ]);
    }

    /**
     * Update the specified Ranking in storage.
-     * @param  int $id
+     * @param  int              $id
     * @param UpdateRankRequest $request
     * @return Response
     * @throws \Prettus\Validator\Exceptions\ValidatorException
@@ -151,6 +158,7 @@ class RankController extends BaseController

        if (empty($rank)) {
            Flash::error('Ranking not found');
+
            return redirect(route('admin.ranks.index'));
        }

@@ -158,6 +166,7 @@ class RankController extends BaseController
        Cache::forget(config('cache.keys.RANKS_PILOT_LIST.key'));

        Flash::success('Ranking updated successfully.');
+
        return redirect(route('admin.ranks.index'));
    }

@@ -172,12 +181,14 @@ class RankController extends BaseController

        if (empty($rank)) {
            Flash::error('Ranking not found');
+
            return redirect(route('admin.ranks.index'));
        }

        $this->rankRepository->delete($id);

        Flash::success('Ranking deleted successfully.');
+
        return redirect(route('admin.ranks.index'));
    }

@@ -188,15 +199,16 @@ class RankController extends BaseController
    protected function return_subfleet_view($rank)
    {
        $avail_subfleets = $this->getAvailSubfleets($rank);
+
        return view('admin.ranks.subfleets', [
-            'rank' => $rank,
+            'rank'            => $rank,
            'avail_subfleets' => $avail_subfleets,
        ]);
    }

    /**
     * Subfleet operations on a rank
-     * @param $id
+     * @param         $id
     * @param Request $request
     * @return mixed
     */
@@ -205,6 +217,7 @@ class RankController extends BaseController
        $rank = $this->rankRepository->findWithoutFail($id);
        if (empty($rank)) {
            Flash::error('Rank not found!');
+
            return redirect(route('admin.ranks.index'));
        }

@@ -212,17 +225,13 @@ class RankController extends BaseController
        if ($request->isMethod('post')) {
            $subfleet = $this->subfleetRepo->find($request->input('subfleet_id'));
            $this->fleetSvc->addSubfleetToRank($subfleet, $rank);
-        }
-
-        elseif($request->isMethod('put')) {
+        } elseif ($request->isMethod('put')) {
            $override = [];
            $override[$request->name] = $request->value;
            $subfleet = $this->subfleetRepo->find($request->input('subfleet_id'));

            $this->fleetSvc->addSubfleetToRank($subfleet, $rank);
-        }
-
-        // remove aircraft from flight
+        } // remove aircraft from flight
        elseif ($request->isMethod('delete')) {
            $subfleet = $this->subfleetRepo->find($request->input('subfleet_id'));
            $this->fleetSvc->removeSubfleetFromRank($subfleet, $rank);
--- a/app/Http/Controllers/Admin/SettingsController.php
+++ b/app/Http/Controllers/Admin/SettingsController.php
@@ -2,11 +2,16 @@

 namespace App\Http\Controllers\Admin;

+use App\Interfaces\Controller;
 use App\Models\Setting;
 use Illuminate\Http\Request;
 use Log;

-class SettingsController extends BaseController
+/**
+ * Class SettingsController
+ * @package App\Http\Controllers\Admin
+ */
+class SettingsController extends Controller
 {
    /**
     * Display the settings. Group them by the setting group
@@ -16,7 +21,7 @@ class SettingsController extends BaseController
        $settings = Setting::orderBy('order', 'asc')->get();
        $settings = $settings->groupBy('group');

-        return view('admin.settings.index',[
+        return view('admin.settings.index', [
            'grouped_settings' => $settings,
        ]);
    }
@@ -28,9 +33,9 @@ class SettingsController extends BaseController
     */
    public function update(Request $request)
    {
-        foreach($request->post() as $id => $value) {
+        foreach ($request->post() as $id => $value) {
            $setting = Setting::find($id);
-            if(!$setting) {
+            if (!$setting) {
                continue;
            }

@@ -40,6 +45,7 @@ class SettingsController extends BaseController
        }

        flash('Settings saved!');
+
        return redirect('/admin/settings');
    }
 }
--- a/app/Http/Controllers/Admin/SubfleetController.php
+++ b/app/Http/Controllers/Admin/SubfleetController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin;

 use App\Http\Requests\CreateSubfleetRequest;
 use App\Http\Requests\UpdateSubfleetRequest;
+use App\Interfaces\Controller;
 use App\Models\Airline;
 use App\Models\Enums\FuelType;
 use App\Models\Expense;
@@ -19,9 +20,12 @@ use Illuminate\Http\Request;
 use Prettus\Repository\Criteria\RequestCriteria;
 use Response;

-class SubfleetController extends BaseController
+/**
+ * Class SubfleetController
+ * @package App\Http\Controllers\Admin
+ */
+class SubfleetController extends Controller
 {
-    /** @var  SubfleetRepository */
    private $aircraftRepo,
            $fareRepo,
            $fareSvc,
@@ -32,11 +36,11 @@ class SubfleetController extends BaseController
    /**
     * SubfleetController constructor.
     * @param AircraftRepository $aircraftRepo
-     * @param FleetService $fleetSvc
-     * @param RankRepository $rankRepo
+     * @param FleetService       $fleetSvc
+     * @param RankRepository     $rankRepo
     * @param SubfleetRepository $subfleetRepo
-     * @param FareRepository $fareRepo
-     * @param FareService $fareSvc
+     * @param FareRepository     $fareRepo
+     * @param FareService        $fareSvc
     */
    public function __construct(
        AircraftRepository $aircraftRepo,
@@ -112,7 +116,7 @@ class SubfleetController extends BaseController
    public function create()
    {
        return view('admin.subfleets.create', [
-            'airlines' => Airline::all()->pluck('name', 'id'),
+            'airlines'   => Airline::all()->pluck('name', 'id'),
            'fuel_types' => FuelType::labels(),
        ]);
    }
@@ -129,6 +133,7 @@ class SubfleetController extends BaseController
        $subfleet = $this->subfleetRepo->create($input);

        Flash::success('Subfleet saved successfully.');
+
        return redirect(route('admin.subfleets.edit', ['id' => $subfleet->id]));
    }

@@ -143,12 +148,14 @@ class SubfleetController extends BaseController

        if (empty($subfleet)) {
            Flash::error('Subfleet not found');
+
            return redirect(route('admin.subfleets.index'));
        }

        $avail_fares = $this->getAvailFares($subfleet);
+
        return view('admin.subfleets.show', [
-            'subfleet' => $subfleet,
+            'subfleet'    => $subfleet,
            'avail_fares' => $avail_fares,
        ]);
    }
@@ -164,6 +171,7 @@ class SubfleetController extends BaseController

        if (empty($subfleet)) {
            Flash::error('Subfleet not found');
+
            return redirect(route('admin.subfleets.index'));
        }

@@ -171,17 +179,17 @@ class SubfleetController extends BaseController
        $avail_ranks = $this->getAvailRanks($subfleet);

        return view('admin.subfleets.edit', [
-            'airlines' => Airline::all()->pluck('name', 'id'),
-            'fuel_types'    => FuelType::labels(),
-            'avail_fares'   => $avail_fares,
-            'avail_ranks'   => $avail_ranks,
-            'subfleet'      => $subfleet,
+            'airlines'    => Airline::all()->pluck('name', 'id'),
+            'fuel_types'  => FuelType::labels(),
+            'avail_fares' => $avail_fares,
+            'avail_ranks' => $avail_ranks,
+            'subfleet'    => $subfleet,
        ]);
    }

    /**
     * Update the specified Subfleet in storage.
-     * @param  int $id
+     * @param  int                  $id
     * @param UpdateSubfleetRequest $request
     * @return Response
     * @throws \Prettus\Validator\Exceptions\ValidatorException
@@ -192,12 +200,14 @@ class SubfleetController extends BaseController

        if (empty($subfleet)) {
            Flash::error('Subfleet not found');
+
            return redirect(route('admin.subfleets.index'));
        }

        $this->subfleetRepo->update($request->all(), $id);

        Flash::success('Subfleet updated successfully.');
+
        return redirect(route('admin.subfleets.index'));
    }

@@ -212,20 +222,23 @@ class SubfleetController extends BaseController

        if (empty($subfleet)) {
            Flash::error('Subfleet not found');
+
            return redirect(route('admin.subfleets.index'));
        }

        # Make sure no aircraft are assigned to this subfleet
        # before trying to delete it, or else things might go boom
        $aircraft = $this->aircraftRepo->findWhere(['subfleet_id' => $id], ['id']);
-        if($aircraft->count() > 0) {
+        if ($aircraft->count() > 0) {
            Flash::error('There are aircraft still assigned to this subfleet, you can\'t delete it!')->important();
+
            return redirect(route('admin.subfleets.index'));
        }

        $this->subfleetRepo->delete($id);

        Flash::success('Subfleet deleted successfully.');
+
        return redirect(route('admin.subfleets.index'));
    }

@@ -240,7 +253,7 @@ class SubfleetController extends BaseController
        $avail_ranks = $this->getAvailRanks($subfleet);

        return view('admin.subfleets.ranks', [
-            'subfleet' => $subfleet,
+            'subfleet'    => $subfleet,
            'avail_ranks' => $avail_ranks,
        ]);
    }
@@ -263,7 +276,7 @@ class SubfleetController extends BaseController

    /**
     * Operations for associating ranks to the subfleet
-     * @param $id
+     * @param         $id
     * @param Request $request
     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
     */
@@ -284,23 +297,20 @@ class SubfleetController extends BaseController
        if ($request->isMethod('post')) {
            $rank = $this->rankRepo->find($request->input('rank_id'));
            $this->fleetSvc->addSubfleetToRank($subfleet, $rank);
-        }
-
-        elseif ($request->isMethod('put')) {
+        } elseif ($request->isMethod('put')) {
            $override = [];
            $rank = $this->rankRepo->find($request->input('rank_id'));
            $override[$request->name] = $request->value;

            $this->fleetSvc->addSubfleetToRank($subfleet, $rank, $override);
-        }
-
-        // dissassociate fare from teh aircraft
+        } // dissassociate fare from teh aircraft
        elseif ($request->isMethod('delete')) {
            $rank = $this->rankRepo->find($request->input('rank_id'));
            $this->fleetSvc->removeSubfleetFromRank($subfleet, $rank);
        }

        $subfleet->save();
+
        return $this->return_ranks_view($subfleet);
    }

@@ -311,6 +321,7 @@ class SubfleetController extends BaseController
    protected function return_expenses_view(?Subfleet $subfleet)
    {
        $subfleet->refresh();
+
        return view('admin.subfleets.expenses', [
            'subfleet' => $subfleet,
        ]);
@@ -318,7 +329,7 @@ class SubfleetController extends BaseController

    /**
     * Operations for associating ranks to the subfleet
-     * @param $id
+     * @param         $id
     * @param Request $request
     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
     * @throws \Exception
@@ -357,7 +368,7 @@ class SubfleetController extends BaseController

    /**
     * Operations on fares to the subfleet
-     * @param $id
+     * @param         $id
     * @param Request $request
     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
     */
@@ -379,17 +390,13 @@ class SubfleetController extends BaseController
        if ($request->isMethod('post')) {
            $fare = $this->fareRepo->find($request->fare_id);
            $this->fareSvc->setForSubfleet($subfleet, $fare);
-        }
-
-        // update the pivot table with overrides for the fares
+        } // update the pivot table with overrides for the fares
        elseif ($request->isMethod('put')) {
            $override = [];
            $fare = $this->fareRepo->find($request->fare_id);
            $override[$request->name] = $request->value;
            $this->fareSvc->setForSubfleet($subfleet, $fare, $override);
-        }
-
-        // dissassociate fare from teh aircraft
+        } // dissassociate fare from teh aircraft
        elseif ($request->isMethod('delete')) {
            $fare = $this->fareRepo->find($request->fare_id);
            $this->fareSvc->delFareFromSubfleet($subfleet, $fare);
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -5,7 +5,7 @@ namespace App\Http\Controllers\Admin;
 use App\Facades\Utils;
 use App\Http\Requests\CreateUserRequest;
 use App\Http\Requests\UpdateUserRequest;
-use App\Models\Airline;
+use App\Interfaces\Controller;
 use App\Models\Rank;
 use App\Models\Role;
 use App\Models\User;
@@ -23,7 +23,11 @@ use Log;
 use Prettus\Repository\Exceptions\RepositoryException;
 use Response;

-class UserController extends BaseController
+/**
+ * Class UserController
+ * @package App\Http\Controllers\Admin
+ */
+class UserController extends Controller
 {
    private $airlineRepo,
            $airportRepo,
@@ -35,9 +39,9 @@ class UserController extends BaseController
     * UserController constructor.
     * @param AirlineRepository $airlineRepo
     * @param AirportRepository $airportRepo
-     * @param PirepRepository $pirepRepo
-     * @param UserRepository $userRepo
-     * @param UserService $userSvc
+     * @param PirepRepository   $pirepRepo
+     * @param UserRepository    $userRepo
+     * @param UserService       $userSvc
     */
    public function __construct(
        AirlineRepository $airlineRepo,
@@ -67,7 +71,7 @@ class UserController extends BaseController
        }

        return view('admin.users.index', [
-            'users' => $users,
+            'users'   => $users,
            'country' => new \League\ISO3166\ISO3166(),
        ]);
    }
@@ -82,14 +86,14 @@ class UserController extends BaseController
        $airports = $this->airportRepo->selectBoxList(false, setting('pilots.home_hubs_only'));

        return view('admin.users.create', [
-            'user' => null,
-            'pireps' => null,
-            'airlines' => $airlines,
+            'user'      => null,
+            'pireps'    => null,
+            'airlines'  => $airlines,
            'timezones' => Timezonelist::toArray(),
-            'country' => new \League\ISO3166\ISO3166(),
-            'airports' => $airports,
-            'ranks' => Rank::all()->pluck('name', 'id'),
-            'roles' => Role::all()->pluck('name', 'id'),
+            'country'   => new \League\ISO3166\ISO3166(),
+            'airports'  => $airports,
+            'ranks'     => Rank::all()->pluck('name', 'id'),
+            'roles'     => Role::all()->pluck('name', 'id'),
        ]);
    }

@@ -105,6 +109,7 @@ class UserController extends BaseController
        $user = $this->userRepo->create($input);

        Flash::success('User saved successfully.');
+
        return redirect(route('admin.users.index'));
    }

@@ -119,6 +124,7 @@ class UserController extends BaseController

        if (empty($user)) {
            Flash::error('User not found');
+
            return redirect(route('admin.users.index'));
        }

@@ -130,14 +136,14 @@ class UserController extends BaseController
        $airports = $this->airportRepo->selectBoxList(false, setting('pilots.home_hubs_only'));

        return view('admin.users.show', [
-            'user' => $user,
-            'pireps' => $pireps,
-            'airlines' => $airlines,
+            'user'      => $user,
+            'pireps'    => $pireps,
+            'airlines'  => $airlines,
            'timezones' => Timezonelist::toArray(),
-            'country' => new \League\ISO3166\ISO3166(),
-            'airports' => $airports,
-            'ranks' => Rank::all()->pluck('name', 'id'),
-            'roles' => Role::all()->pluck('name', 'id'),
+            'country'   => new \League\ISO3166\ISO3166(),
+            'airports'  => $airports,
+            'ranks'     => Rank::all()->pluck('name', 'id'),
+            'roles'     => Role::all()->pluck('name', 'id'),
        ]);
    }

@@ -152,6 +158,7 @@ class UserController extends BaseController

        if (empty($user)) {
            Flash::error('User not found');
+
            return redirect(route('admin.users.index'));
        }

@@ -168,20 +175,20 @@ class UserController extends BaseController
        $airports = $this->airportRepo->selectBoxList(false, setting('pilots.home_hubs_only'));

        return view('admin.users.edit', [
-            'user' => $user,
-            'pireps' => $pireps,
+            'user'      => $user,
+            'pireps'    => $pireps,
            'countries' => $countries,
            'timezones' => Timezonelist::toArray(),
-            'airports' => $airports,
-            'airlines' => $airlines,
-            'ranks' => Rank::all()->pluck('name', 'id'),
-            'roles' => Role::all()->pluck('name', 'id'),
+            'airports'  => $airports,
+            'airlines'  => $airlines,
+            'ranks'     => Rank::all()->pluck('name', 'id'),
+            'roles'     => Role::all()->pluck('name', 'id'),
        ]);
    }

    /**
     * Update the specified User in storage.
-     * @param int $id
+     * @param int               $id
     * @param UpdateUserRequest $request
     * @return Response
     * @throws \Prettus\Validator\Exceptions\ValidatorException
@@ -192,11 +199,12 @@ class UserController extends BaseController

        if (empty($user)) {
            Flash::error('User not found');
+
            return redirect(route('admin.users.index'));
        }

        $req_data = $request->all();
-        if(!$request->filled('password')) {
+        if (!$request->filled('password')) {
            unset($req_data['password']);
        } else {
            $req_data['password'] = Hash::make($req_data['password']);
@@ -206,17 +214,18 @@ class UserController extends BaseController

        $user = $this->userRepo->update($req_data, $id);

-        if($original_user_state !== $user->state) {
+        if ($original_user_state !== $user->state) {
            $this->userSvc->changeUserState($user, $original_user_state);
        }

        # Delete all of the roles and then re-attach the valid ones
-        DB::table('role_user')->where('user_id',$id)->delete();
+        DB::table('role_user')->where('user_id', $id)->delete();
        foreach ($request->input('roles') as $key => $value) {
            $user->attachRole($value);
        }

        Flash::success('User updated successfully.');
+
        return redirect(route('admin.users.index'));
    }

@@ -231,30 +240,33 @@ class UserController extends BaseController

        if (empty($user)) {
            Flash::error('User not found');
+
            return redirect(route('admin.users.index'));
        }

        $this->userRepo->delete($id);

        Flash::success('User deleted successfully.');
+
        return redirect(route('admin.users.index'));
    }

    /**
     * Regenerate the user's API key
-     * @param $id
+     * @param         $id
     * @param Request $request
     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
     */
    public function regen_apikey($id, Request $request)
    {
        $user = User::find($id);
-        Log::info('Regenerating API key "' . $user->pilot_id . '"');
+        Log::info('Regenerating API key "'.$user->pilot_id.'"');

        $user->api_key = Utils::generateApiKey();
        $user->save();

        flash('New API key generated!')->success();
+
        return redirect(route('admin.users.edit', ['id' => $id]));
    }
 }