Apply fixes from StyleCI

2018-08-26 16:40:04 +00:00
parent 20f46adbc4
commit 9596d88b48
407 changed files with 4032 additions and 3286 deletions
--- a/app/Http/Controllers/Frontend/AcarsController.php
+++ b/app/Http/Controllers/Frontend/AcarsController.php
@@ -9,15 +9,15 @@ use Illuminate\Http\Request;

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

    /**
     * AcarsController constructor.
+     *
     * @param AcarsRepository $acarsRepo
     * @param GeoService      $geoSvc
     */
@@ -31,6 +31,7 @@ class AcarsController extends Controller

    /**
     * @param Request $request
+     *
     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
     */
    public function index(Request $request)
--- a/app/Http/Controllers/Frontend/AirportController.php
+++ b/app/Http/Controllers/Frontend/AirportController.php
@@ -3,21 +3,18 @@
 namespace App\Http\Controllers\Frontend;

 use App\Interfaces\Controller;
-use App\Models\User;
 use App\Repositories\AirportRepository;
 use App\Repositories\FlightRepository;
 use Flash;
-use Illuminate\Database\QueryException;
 use Request;

 /**
 * Class HomeController
- * @package App\Http\Controllers\Frontend
 */
 class AirportController extends Controller
 {
-    private $airportRepo,
-            $flightRepo;
+    private $airportRepo;
+    private $flightRepo;

    public function __construct(
        AirportRepository $airportRepo,
@@ -29,6 +26,8 @@ class AirportController extends Controller

    /**
     * Show the airport
+     *
+     * @param mixed $id
     */
    public function show($id, Request $request)
    {
@@ -53,8 +52,8 @@ class AirportController extends Controller
            ])->all();

        return view('airports.show', [
-            'airport' => $airport,
-            'inbound_flights' => $inbound_flights,
+            'airport'          => $airport,
+            'inbound_flights'  => $inbound_flights,
            'outbound_flights' => $outbound_flights,
        ]);
    }
--- a/app/Http/Controllers/Frontend/DashboardController.php
+++ b/app/Http/Controllers/Frontend/DashboardController.php
@@ -8,7 +8,6 @@ use Illuminate\Support\Facades\Auth;

 /**
 * Class DashboardController
- * @package App\Http\Controllers\Frontend
 */
 class DashboardController extends Controller
 {
@@ -16,6 +15,7 @@ class DashboardController extends Controller

    /**
     * DashboardController constructor.
+     *
     * @param PirepRepository $pirepRepo
     */
    public function __construct(PirepRepository $pirepRepo)
--- a/app/Http/Controllers/Frontend/DownloadController.php
+++ b/app/Http/Controllers/Frontend/DownloadController.php
@@ -10,7 +10,6 @@ use Illuminate\Support\Facades\Storage;

 /**
 * Class DownloadController
- * @package App\Http\Controllers\Frontend
 */
 class DownloadController extends Controller
 {
@@ -25,7 +24,7 @@ class DownloadController extends Controller
         * Group all the files but compound the model with the ID,
         * since we can have multiple files for every `ref_model`
         */
-        $grouped_files = $files->groupBy(function($item, $key) {
+        $grouped_files = $files->groupBy(function ($item, $key) {
            return $item['ref_model'].'_'.$item['ref_model_id'];
        });

@@ -35,7 +34,7 @@ class DownloadController extends Controller
         * name of the group to the object instance "name"
         */
        $regrouped_files = [];
-        foreach($grouped_files as $group => $files) {
+        foreach ($grouped_files as $group => $files) {
            [$class, $id] = explode('_', $group);
            $klass = new $class();
            $obj = $klass->find($id);
@@ -54,6 +53,8 @@ class DownloadController extends Controller

    /**
     * Show the application dashboard.
+     *
+     * @param mixed $id
     */
    public function show($id)
    {
@@ -71,10 +72,10 @@ class DownloadController extends Controller
            return redirect(config('app.login_redirect'));
        }

-        ++$file->download_count;
+        $file->download_count++;
        $file->save();

-        if($file->disk === 'public') {
+        if ($file->disk === 'public') {
            $storage = Storage::disk('public');
            return $storage->download($file->path, $file->filename);
        }
--- a/app/Http/Controllers/Frontend/FlightController.php
+++ b/app/Http/Controllers/Frontend/FlightController.php
@@ -17,17 +17,17 @@ use Prettus\Repository\Exceptions\RepositoryException;

 /**
 * Class FlightController
- * @package App\Http\Controllers\Frontend
 */
 class FlightController extends Controller
 {
-    private $airlineRepo,
-            $airportRepo,
-            $flightRepo,
-            $geoSvc;
+    private $airlineRepo;
+    private $airportRepo;
+    private $flightRepo;
+    private $geoSvc;

    /**
     * FlightController constructor.
+     *
     * @param AirlineRepository $airlineRepo
     * @param AirportRepository $airportRepo
     * @param FlightRepository  $flightRepo
@@ -47,6 +47,7 @@ class FlightController extends Controller

    /**
     * @param Request $request
+     *
     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
     */
    public function index(Request $request)
@@ -56,7 +57,7 @@ class FlightController extends Controller
            'visible' => true,
        ];

-        if(setting('pilots.restrict_to_company')) {
+        if (setting('pilots.restrict_to_company')) {
            $where['airline_id'] = Auth::user()->airline_id;
        }

@@ -90,7 +91,9 @@ class FlightController extends Controller

    /**
     * Find the user's bids and display them
+     *
     * @param Request $request
+     *
     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
     */
    public function bids(Request $request)
@@ -111,15 +114,18 @@ class FlightController extends Controller

    /**
     * Make a search request using the Repository search
+     *
     * @param Request $request
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     *
     * @throws \Prettus\Repository\Exceptions\RepositoryException
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
     */
    public function search(Request $request)
    {
-        if(setting('pilots.restrict_to_company')) {
+        if (setting('pilots.restrict_to_company')) {
            $this->flightRepo
-                ->pushCriteria(New WhereCriteria($request, ['airline_id' => Auth::user()->airline_id]))
+                ->pushCriteria(new WhereCriteria($request, ['airline_id' => Auth::user()->airline_id]))
                ->paginate();
        }

@@ -141,7 +147,9 @@ class FlightController extends Controller

    /**
     * Show the flight information page
+     *
     * @param $id
+     *
     * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View
     */
    public function show($id)
--- a/app/Http/Controllers/Frontend/HomeController.php
+++ b/app/Http/Controllers/Frontend/HomeController.php
@@ -8,7 +8,6 @@ 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
@@ -2,7 +2,6 @@

 namespace App\Http\Controllers\Frontend;

-use App\Exceptions\UserNotAtAirport;
 use App\Facades\Utils;
 use App\Http\Requests\CreatePirepRequest;
 use App\Http\Requests\UpdatePirepRequest;
@@ -30,22 +29,22 @@ use PirepStatus;

 /**
 * Class PirepController
- * @package App\Http\Controllers\Frontend
 */
 class PirepController extends Controller
 {
-    private $aircraftRepo,
-            $airlineRepo,
-            $fareSvc,
-            $geoSvc,
-            $pirepRepo,
-            $airportRepo,
-            $pirepFieldRepo,
-            $pirepSvc,
-            $userSvc;
+    private $aircraftRepo;
+    private $airlineRepo;
+    private $fareSvc;
+    private $geoSvc;
+    private $pirepRepo;
+    private $airportRepo;
+    private $pirepFieldRepo;
+    private $pirepSvc;
+    private $userSvc;

    /**
     * PirepController constructor.
+     *
     * @param AircraftRepository   $aircraftRepo
     * @param AirlineRepository    $airlineRepo
     * @param AirportRepository    $airportRepo
@@ -81,7 +80,10 @@ class PirepController extends Controller

    /**
     * Dropdown with aircraft grouped by subfleet
-     * @param null $user
+     *
+     * @param null  $user
+     * @param mixed $add_blank
+     *
     * @return array
     */
    public function aircraftList($user = null, $add_blank = false)
@@ -107,6 +109,7 @@ class PirepController extends Controller

    /**
     * Save any custom fields found
+     *
     * @param Pirep   $pirep
     * @param Request $request
     */
@@ -123,7 +126,7 @@ class PirepController extends Controller
                'name'   => $field->name,
                'slug'   => $field->slug,
                'value'  => $request->input($field->slug),
-                'source' => PirepSource::MANUAL
+                'source' => PirepSource::MANUAL,
            ];
        }

@@ -133,8 +136,10 @@ class PirepController extends Controller

    /**
     * Save the fares that have been specified/saved
+     *
     * @param Pirep   $pirep
     * @param Request $request
+     *
     * @throws \Exception
     */
    protected function saveFares(Pirep $pirep, Request $request)
@@ -163,8 +168,10 @@ class PirepController extends Controller

    /**
     * @param Request $request
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     *
     * @throws \Prettus\Repository\Exceptions\RepositoryException
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
     */
    public function index(Request $request)
    {
@@ -184,6 +191,7 @@ class PirepController extends Controller

    /**
     * @param $id
+     *
     * @return mixed
     */
    public function show($id)
@@ -204,7 +212,9 @@ class PirepController extends Controller

    /**
     * Return the fares form for a given aircraft
+     *
     * @param Request $request
+     *
     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
     */
    public function fares(Request $request)
@@ -220,6 +230,7 @@ class PirepController extends Controller

    /**
     * Create a new flight report
+     *
     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
     */
    public function create()
@@ -239,8 +250,10 @@ class PirepController extends Controller

    /**
     * @param CreatePirepRequest $request
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     *
     * @throws \Exception
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
     */
    public function store(CreatePirepRequest $request)
    {
@@ -251,8 +264,8 @@ class PirepController extends Controller
        $attrs = $request->all();
        $attrs['submit'] = strtolower($attrs['submit']);

-        if($attrs['submit'] === 'submit') {
-            # Are they allowed at this airport?
+        if ($attrs['submit'] === 'submit') {
+            // Are they allowed at this airport?
            if (setting('pilots.only_flights_from_current')
                && Auth::user()->curr_airport_id !== $pirep->dpt_airport_id) {
                return $this->flashError(
@@ -261,7 +274,7 @@ class PirepController extends Controller
                );
            }

-            # Can they fly this aircraft?
+            // Can they fly this aircraft?
            if (setting('pireps.restrict_aircraft_to_rank', false)
                && !$this->userSvc->aircraftAllowed(Auth::user(), $pirep->aircraft_id)) {
                return $this->flashError(
@@ -270,7 +283,7 @@ class PirepController extends Controller
                );
            }

-            # is the aircraft in the right place?
+            // is the aircraft in the right place?
            if (setting('pireps.only_aircraft_at_dpt_airport')
                && $pirep->aircraft_id !== $pirep->dpt_airport_id) {
                return $this->flashError(
@@ -279,7 +292,7 @@ class PirepController extends Controller
                );
            }

-            # Make sure this isn't a duplicate
+            // Make sure this isn't a duplicate
            $dupe_pirep = $this->pirepSvc->findDuplicate($pirep);
            if ($dupe_pirep !== false) {
                return $this->flashError(
@@ -305,13 +318,13 @@ class PirepController extends Controller
        // Depending on the button they selected, set an initial state
        // Can be saved as a draft or just submitted
        if ($attrs['submit'] === 'save') {
-            if(!$pirep->read_only) {
+            if (!$pirep->read_only) {
                $pirep->state = PirepState::DRAFT;
            }

            $pirep->save();
            Flash::success('PIREP saved successfully.');
-        } else if ($attrs['submit'] === 'submit') {
+        } elseif ($attrs['submit'] === 'submit') {
            $this->pirepSvc->submit($pirep);
            Flash::success('PIREP submitted!');
        }
@@ -321,7 +334,9 @@ class PirepController extends Controller

    /**
     * Show the form for editing the specified Pirep.
-     * @param  int $id
+     *
+     * @param int $id
+     *
     * @return mixed
     */
    public function edit($id)
@@ -332,16 +347,16 @@ class PirepController extends Controller
            return redirect(route('frontend.pireps.index'));
        }

-        # Eager load the subfleet and fares under it
+        // Eager load the subfleet and fares under it
        $pirep->aircraft->load('subfleet.fares');

        $time = new Time($pirep->flight_time);
        $pirep->hours = $time->hours;
        $pirep->minutes = $time->minutes;

-        # set the custom fields
+        // set the custom fields
        foreach ($pirep->fields as $field) {
-            if($field->slug == null) {
+            if ($field->slug == null) {
                $field->slug = str_slug($field->name);
            }

@@ -349,7 +364,7 @@ class PirepController extends Controller
            $pirep->{$field_name} = $field->value;
        }

-        # set the fares
+        // set the fares
        foreach ($pirep->fares as $fare) {
            $field_name = 'fare_'.$fare->fare_id;
            $pirep->{$field_name} = $fare->count;
@@ -368,9 +383,11 @@ class PirepController extends Controller
    /**
     * @param                    $id
     * @param UpdatePirepRequest $request
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     *
     * @throws \Prettus\Validator\Exceptions\ValidatorException
     * @throws \Exception
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
     */
    public function update($id, UpdatePirepRequest $request)
    {
@@ -384,7 +401,7 @@ class PirepController extends Controller
        $attrs = $request->all();
        $attrs['submit'] = strtolower($attrs['submit']);

-        # Fix the time
+        // Fix the time
        $attrs['flight_time'] = Time::init(
            $attrs['minutes'],
            $attrs['hours'])->getMinutes();
@@ -399,12 +416,12 @@ class PirepController extends Controller
        $this->saveCustomFields($pirep, $request);
        $this->saveFares($pirep, $request);

-        if($attrs['submit'] === 'save') {
+        if ($attrs['submit'] === 'save') {
            Flash::success('PIREP saved successfully.');
-        } else if($attrs['submit'] === 'submit') {
+        } elseif ($attrs['submit'] === 'submit') {
            $this->pirepSvc->submit($pirep);
            Flash::success('PIREP submitted!');
-        } else if($attrs['submit'] === 'delete' || $attrs['submit'] === 'cancel') {
+        } elseif ($attrs['submit'] === 'delete' || $attrs['submit'] === 'cancel') {
            $this->pirepRepo->update([
                'state'  => PirepState::CANCELLED,
                'status' => PirepStatus::CANCELLED,
@@ -419,8 +436,10 @@ class PirepController extends Controller

    /**
     * Submit the PIREP
+     *
     * @param         $id
     * @param Request $request
+     *
     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
     */
    public function submit($id, Request $request)
--- a/app/Http/Controllers/Frontend/ProfileController.php
+++ b/app/Http/Controllers/Frontend/ProfileController.php
@@ -13,24 +13,24 @@ use Flash;
 use Hash;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Storage;
+use Intervention\Image\Facades\Image;
 use Jackiedo\Timezonelist\Facades\Timezonelist;
 use Log;
 use Validator;
-use Intervention\Image\Facades\Image;
-use Illuminate\Support\Facades\Storage;

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

    /**
     * ProfileController constructor.
+     *
     * @param AirlineRepository $airlineRepo
     * @param AirportRepository $airportRepo
     * @param UserRepository    $userRepo
@@ -64,6 +64,7 @@ class ProfileController extends Controller

    /**
     * @param $id
+     *
     * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View
     */
    public function show($id)
@@ -85,7 +86,9 @@ class ProfileController extends Controller

    /**
     * Show the edit for form the user's profile
+     *
     * @param Request $request
+     *
     * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View
     */
    public function edit(Request $request)
@@ -111,8 +114,10 @@ class ProfileController extends Controller

    /**
     * @param Request $request
-     * @return $this
+     *
     * @throws \Prettus\Validator\Exceptions\ValidatorException
+     *
+     * @return $this
     */
    public function update(Request $request)
    {
@@ -148,7 +153,7 @@ class ProfileController extends Controller
        }
        if ($request->hasFile('avatar')) {
            $avatar = $request->file('avatar');
-            $file_name = $user->pilot_id . '.' .$avatar->getClientOriginalExtension();
+            $file_name = $user->pilot_id.'.'.$avatar->getClientOriginalExtension();
            $path = "avatars/{$file_name}";
            Image::make($avatar)->resize(config('phpvms.avatar.width'), config('phpvms.avatar.height'))->save(public_path('uploads/avatars/'.$file_name));
            $req_data['avatar'] = $path;
@@ -163,7 +168,9 @@ class ProfileController extends Controller

    /**
     * Regenerate the user's API key
+     *
     * @param Request $request
+     *
     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
     */
    public function regen_apikey(Request $request)
--- a/app/Http/Controllers/Frontend/UserController.php
+++ b/app/Http/Controllers/Frontend/UserController.php
@@ -8,7 +8,6 @@ use Illuminate\Http\Request;

 /**
 * Class UserController
- * @package App\Http\Controllers\Frontend
 */
 class UserController extends Controller
 {
@@ -16,6 +15,7 @@ class UserController extends Controller

    /**
     * UserController constructor.
+     *
     * @param UserRepository $userRepo
     */
    public function __construct(
@@ -26,6 +26,7 @@ class UserController extends Controller

    /**
     * @param Request $request
+     *
     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
     */
    public function index(Request $request)