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/Frontend/AcarsController.php
+++ b/app/Http/Controllers/Frontend/AcarsController.php
@@ -2,19 +2,24 @@

 namespace App\Http\Controllers\Frontend;

-use App\Http\Controllers\Controller;
+use App\Interfaces\Controller;
 use App\Repositories\AcarsRepository;
 use App\Services\GeoService;
 use Illuminate\Http\Request;

+/**
+ * Class AcarsController
+ * @package App\Http\Controllers\Frontend
+ */
 class AcarsController extends Controller
 {
-    private $acarsRepo, $geoSvc;
+    private $acarsRepo,
+            $geoSvc;

    /**
     * AcarsController constructor.
     * @param AcarsRepository $acarsRepo
-     * @param GeoService $geoSvc
+     * @param GeoService      $geoSvc
     */
    public function __construct(
        AcarsRepository $acarsRepo,
@@ -33,8 +38,8 @@ class AcarsController extends Controller
        $pireps = $this->acarsRepo->getPositions();
        $positions = $this->geoSvc->getFeatureForLiveFlights($pireps);

-        return view('acars.index',[
-            'pireps' => $pireps,
+        return view('acars.index', [
+            'pireps'    => $pireps,
            'positions' => $positions,
        ]);
    }
--- a/app/Http/Controllers/Frontend/DashboardController.php
+++ b/app/Http/Controllers/Frontend/DashboardController.php
@@ -2,26 +2,26 @@

 namespace App\Http\Controllers\Frontend;

-use App\Http\Controllers\Controller;
+use App\Interfaces\Controller;
 use App\Repositories\PirepRepository;
-use App\Repositories\UserRepository;
 use Illuminate\Support\Facades\Auth;

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

    /**
     * DashboardController constructor.
     * @param PirepRepository $pirepRepo
-     * @param UserRepository $userRepo
     */
    public function __construct(
-        PirepRepository $pirepRepo,
-        UserRepository $userRepo
+        PirepRepository $pirepRepo
    ) {
        $this->pirepRepo = $pirepRepo;
-        $this->userRepo = $userRepo;
    }

    /**
@@ -34,7 +34,8 @@ class DashboardController extends Controller

        try {
            $last_pirep = $this->pirepRepo->find($user->last_pirep_id);
-        } catch(\Exception $e) { }
+        } catch (\Exception $e) {
+        }

        return view('dashboard.index', [
            'user'       => $user,
--- a/app/Http/Controllers/Frontend/FlightController.php
+++ b/app/Http/Controllers/Frontend/FlightController.php
@@ -2,19 +2,22 @@

 namespace App\Http\Controllers\Frontend;

-use App\Http\Controllers\Controller;
+use App\Interfaces\Controller;
 use App\Models\Bid;
 use App\Repositories\AirlineRepository;
 use App\Repositories\AirportRepository;
 use App\Repositories\Criteria\WhereCriteria;
 use App\Repositories\FlightRepository;
-use App\Services\FlightService;
 use App\Services\GeoService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Log;
 use Prettus\Repository\Exceptions\RepositoryException;

+/**
+ * Class FlightController
+ * @package App\Http\Controllers\Frontend
+ */
 class FlightController extends Controller
 {
    private $airlineRepo,
@@ -26,21 +29,19 @@ class FlightController extends Controller
     * FlightController constructor.
     * @param AirlineRepository $airlineRepo
     * @param AirportRepository $airportRepo
-     * @param FlightRepository $flightRepo
-     * @param FlightService $flightSvc
-     * @param GeoService $geoSvc
+     * @param FlightRepository  $flightRepo
+     * @param GeoService        $geoSvc
     */
    public function __construct(
        AirlineRepository $airlineRepo,
        AirportRepository $airportRepo,
        FlightRepository $flightRepo,
-        FlightService $flightSvc,
        GeoService $geoSvc
-    ) {
+    )
+    {
        $this->airlineRepo = $airlineRepo;
        $this->airportRepo = $airportRepo;
        $this->flightRepo = $flightRepo;
-        $this->flightSvc = $flightSvc;
        $this->geoSvc = $geoSvc;
    }

@@ -66,13 +67,13 @@ class FlightController extends Controller
        $flights = $this->flightRepo->paginate();

        $saved_flights = Bid::where('user_id', Auth::id())
-                         ->pluck('flight_id')->toArray();
+            ->pluck('flight_id')->toArray();

        return view('flights.index', [
            'airlines' => $this->airlineRepo->selectBoxList(true),
            'airports' => $this->airportRepo->selectBoxList(true),
-            'flights' => $flights,
-            'saved' => $saved_flights,
+            'flights'  => $flights,
+            'saved'    => $saved_flights,
        ]);
    }

@@ -87,13 +88,13 @@ class FlightController extends Controller
        $flights = $this->flightRepo->searchCriteria($request)->paginate();

        $saved_flights = Bid::where('user_id', Auth::id())
-                         ->pluck('flight_id')->toArray();
+            ->pluck('flight_id')->toArray();

        return view('flights.index', [
            'airlines' => $this->airlineRepo->selectBoxList(true),
            'airports' => $this->airportRepo->selectBoxList(true),
-            'flights' => $flights,
-            'saved' => $saved_flights,
+            'flights'  => $flights,
+            'saved'    => $saved_flights,
        ]);
    }

@@ -107,13 +108,14 @@ class FlightController extends Controller
        $flight = $this->flightRepo->find($id);
        if (empty($flight)) {
            Flash::error('Flight not found!');
+
            return redirect(route('frontend.dashboard.index'));
        }

        $map_features = $this->geoSvc->flightGeoJson($flight);

        return view('flights.show', [
-            'flight' => $flight,
+            'flight'       => $flight,
            'map_features' => $map_features,
        ]);
    }
--- a/app/Http/Controllers/Frontend/HomeController.php
+++ b/app/Http/Controllers/Frontend/HomeController.php
@@ -2,10 +2,14 @@

 namespace App\Http\Controllers\Frontend;

-use App\Http\Controllers\Controller;
+use App\Interfaces\Controller;
 use App\Models\User;
 use Illuminate\Database\QueryException;

+/**
+ * Class HomeController
+ * @package App\Http\Controllers\Frontend
+ */
 class HomeController extends Controller
 {
    /**
--- a/app/Http/Controllers/Frontend/PirepController.php
+++ b/app/Http/Controllers/Frontend/PirepController.php
@@ -3,9 +3,9 @@
 namespace App\Http\Controllers\Frontend;

 use App\Facades\Utils;
-use App\Http\Controllers\Controller;
 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;
@@ -25,7 +25,10 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Log;

-
+/**
+ * Class PirepController
+ * @package App\Http\Controllers\Frontend
+ */
 class PirepController extends Controller
 {
    private $aircraftRepo,
@@ -40,15 +43,15 @@ class PirepController extends Controller

    /**
     * PirepController constructor.
-     * @param AircraftRepository $aircraftRepo
-     * @param AirlineRepository $airlineRepo
-     * @param AirportRepository $airportRepo
-     * @param FareService $fareSvc
-     * @param GeoService $geoSvc
-     * @param PirepRepository $pirepRepo
+     * @param AircraftRepository   $aircraftRepo
+     * @param AirlineRepository    $airlineRepo
+     * @param AirportRepository    $airportRepo
+     * @param FareService          $fareSvc
+     * @param GeoService           $geoSvc
+     * @param PirepRepository      $pirepRepo
     * @param PirepFieldRepository $pirepFieldRepo
-     * @param PirepService $pirepSvc
-     * @param UserService $userSvc
+     * @param PirepService         $pirepSvc
+     * @param UserService          $userSvc
     */
    public function __construct(
        AircraftRepository $aircraftRepo,
@@ -78,19 +81,19 @@ class PirepController extends Controller
     * @param null $user
     * @return array
     */
-    public function aircraftList($user=null, $add_blank=false)
+    public function aircraftList($user = null, $add_blank = false)
    {
        $aircraft = [];
        $subfleets = $this->userSvc->getAllowableSubfleets($user);

-        if($add_blank) {
+        if ($add_blank) {
            $aircraft[''] = '';
        }

        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;
@@ -101,7 +104,7 @@ class PirepController extends Controller

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

            $custom_fields[] = [
-                'name' => $field->name,
-                'value' => $request->input($field->slug),
+                'name'   => $field->name,
+                'value'  => $request->input($field->slug),
                'source' => PirepSource::MANUAL
            ];
        }
@@ -126,17 +129,16 @@ class PirepController extends Controller

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

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

@@ -167,7 +169,7 @@ class PirepController extends Controller
        $pireps = $this->pirepRepo->orderBy('created_at', 'desc')->paginate();

        return view('pireps.index', [
-            'user' => $user,
+            'user'   => $user,
            'pireps' => $pireps,
        ]);
    }
@@ -181,13 +183,14 @@ class PirepController extends Controller
        $pirep = $this->pirepRepo->find($id);
        if (empty($pirep)) {
            Flash::error('Pirep not found');
+
            return redirect(route('frontend.pirep.index'));
        }

        $map_features = $this->geoSvc->pirepGeoJson($pirep);

        return view('pireps.show', [
-            'pirep' => $pirep,
+            'pirep'        => $pirep,
            'map_features' => $map_features,
        ]);
    }
@@ -203,7 +206,7 @@ class PirepController extends Controller
        $aircraft = $this->aircraftRepo->find($aircraft_id);

        return view('pireps.fares', [
-            'aircraft' => $aircraft,
+            'aircraft'  => $aircraft,
            'read_only' => false,
        ]);
    }
@@ -217,13 +220,13 @@ class PirepController extends Controller
        $user = Auth::user();

        return view('pireps.create', [
-            'aircraft' => null,
-            'read_only' => false,
-            'airline_list' => $this->airlineRepo->selectBoxList(true),
+            'aircraft'      => null,
+            'read_only'     => false,
+            'airline_list'  => $this->airlineRepo->selectBoxList(true),
            'aircraft_list' => $this->aircraftList($user, true),
-            'airport_list' => $this->airportRepo->selectBoxList(true),
-            'pirep_fields' => $this->pirepFieldRepo->all(),
-            'field_values' => [],
+            'airport_list'  => $this->airportRepo->selectBoxList(true),
+            'pirep_fields'  => $this->pirepFieldRepo->all(),
+            'field_values'  => [],
        ]);
    }

@@ -242,6 +245,7 @@ class PirepController extends Controller
        $dupe_pirep = $this->pirepSvc->findDuplicate($pirep);
        if ($dupe_pirep !== false) {
            flash()->error('This PIREP has already been filed.');
+
            return redirect(route('frontend.pireps.create'))->withInput();
        }

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

@@ -279,29 +284,29 @@ class PirepController extends Controller
        $read_only = $pirep->state !== PirepState::PENDING;

        # set the custom fields
-        foreach($pirep->fields as $field) {
+        foreach ($pirep->fields as $field) {
            $pirep->{$field->slug} = $field->value;
        }

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

        return view('pireps.edit', [
-            'pirep' => $pirep,
-            'read_only' => $read_only,
-            'aircraft' => $pirep->aircraft,
+            'pirep'         => $pirep,
+            'read_only'     => $read_only,
+            'aircraft'      => $pirep->aircraft,
            'aircraft_list' => $this->aircraftList(),
-            'airline_list' => $this->airlineRepo->selectBoxList(),
-            'airport_list' => $this->airportRepo->selectBoxList(),
-            'pirep_fields' => $this->pirepFieldRepo->all(),
+            'airline_list'  => $this->airlineRepo->selectBoxList(),
+            'airport_list'  => $this->airportRepo->selectBoxList(),
+            'pirep_fields'  => $this->pirepFieldRepo->all(),
        ]);
    }

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

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

@@ -336,6 +342,7 @@ class PirepController extends Controller
        $this->saveFares($pirep, $request);

        Flash::success('Pirep updated successfully.');
+
        return redirect(route('frontend.pireps.show', ['id' => $pirep->id]));
    }
 }
--- a/app/Http/Controllers/Frontend/ProfileController.php
+++ b/app/Http/Controllers/Frontend/ProfileController.php
@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Frontend;

 use App\Facades\Utils;
-use App\Http\Controllers\Controller;
+use App\Interfaces\Controller;
 use App\Models\User;
 use App\Repositories\AirlineRepository;
 use App\Repositories\AirportRepository;
@@ -17,6 +17,10 @@ use Jackiedo\Timezonelist\Facades\Timezonelist;
 use Log;
 use Validator;

+/**
+ * Class ProfileController
+ * @package App\Http\Controllers\Frontend
+ */
 class ProfileController extends Controller
 {
    private $airlineRepo,
@@ -27,7 +31,7 @@ class ProfileController extends Controller
     * ProfileController constructor.
     * @param AirlineRepository $airlineRepo
     * @param AirportRepository $airportRepo
-     * @param UserRepository $userRepo
+     * @param UserRepository    $userRepo
     */
    public function __construct(
        AirlineRepository $airlineRepo,
@@ -44,14 +48,14 @@ class ProfileController extends Controller
     */
    public function index()
    {
-        if(setting('pilots.home_hubs_only')) {
+        if (setting('pilots.home_hubs_only')) {
            $airports = $this->airportRepo->findWhere(['hub' => true]);
        } else {
            $airports = $this->airportRepo->all();
        }

        return view('profile.index', [
-            'user' => Auth::user(),
+            'user'     => Auth::user(),
            'airports' => $airports,
        ]);
    }
@@ -65,13 +69,14 @@ class ProfileController extends Controller
        $user = User::where('id', $id)->first();
        if (empty($user)) {
            Flash::error('User not found!');
+
            return redirect(route('frontend.dashboard.index'));
        }

        $airports = $this->airportRepo->all();

        return view('profile.index', [
-            'user' => $user,
+            'user'     => $user,
            'airports' => $airports,
        ]);
    }
@@ -86,6 +91,7 @@ class ProfileController extends Controller
        $user = User::where('id', Auth::user()->id)->first();
        if (empty($user)) {
            Flash::error('User not found!');
+
            return redirect(route('frontend.dashboard.index'));
        }

@@ -112,10 +118,10 @@ class ProfileController extends Controller
        $user = $this->userRepo->findWithoutFail($id);

        $validator = Validator::make($request->toArray(), [
-            'name' => 'required',
-            'email' => 'required|unique:users,email,'.$id,
+            'name'       => 'required',
+            'email'      => 'required|unique:users,email,'.$id,
            'airline_id' => 'required',
-            'password' => 'confirmed'
+            'password'   => 'confirmed'
        ]);

        if ($validator->fails()) {
@@ -137,6 +143,7 @@ class ProfileController extends Controller
        $this->userRepo->update($req_data, $id);

        Flash::success('Profile updated successfully!');
+
        return redirect(route('frontend.profile.index'));
    }

@@ -154,6 +161,7 @@ class ProfileController extends Controller
        $user->save();

        flash('New API key generated!')->success();
+
        return redirect(route('frontend.profile.index'));
    }
 }
--- a/app/Http/Controllers/Frontend/UserController.php
+++ b/app/Http/Controllers/Frontend/UserController.php
@@ -2,10 +2,14 @@

 namespace App\Http\Controllers\Frontend;

-use App\Http\Controllers\Controller;
+use App\Interfaces\Controller;
 use App\Repositories\UserRepository;
 use Illuminate\Http\Request;

+/**
+ * Class UserController
+ * @package App\Http\Controllers\Frontend
+ */
 class UserController extends Controller
 {
    private $userRepo;
@@ -26,9 +30,9 @@ class UserController extends Controller
     */
    public function index(Request $request)
    {
-        return view('users.index',[
+        return view('users.index', [
            'country' => new \League\ISO3166\ISO3166(),
-            'users' => $this->userRepo->orderBy('name', 'desc')->paginate(),
+            'users'   => $this->userRepo->orderBy('name', 'desc')->paginate(),
        ]);
    }
 }