From ea09a18956c1e0da853780f182a2235b541a57ad Mon Sep 17 00:00:00 2001 From: Nabeel Shahzad Date: Tue, 20 Feb 2018 22:33:09 -0600 Subject: [PATCH] Fixed formatting of almost every file --- app/Bootstrap/LoadConfiguration.php | 2 +- app/Console/Commands/AcarsReplay.php | 5 +- app/Console/Commands/CreateDatabase.php | 3 +- app/Console/Commands/DevCommands.php | 10 ++-- app/Console/Commands/ImportCommand.php | 1 - app/Console/Commands/Importer.php | 1 - app/Console/Commands/NavdataCommand.php | 3 +- app/Console/Commands/TestApi.php | 2 +- app/Console/Services/Database.php | 2 +- app/Console/Services/Importer.php | 25 +++++----- .../2017_06_08_0000_create_users_table.php | 2 +- ...6_08_0005_create_password_resets_table.php | 4 +- .../2017_06_08_0006_create_sessions_table.php | 4 +- ...17_06_09_010621_create_aircrafts_table.php | 3 +- ...2017_06_17_214650_create_flight_tables.php | 1 - .../2017_06_28_195426_create_pirep_tables.php | 1 - .../2017_12_12_174519_create_bids_table.php | 4 +- .../2017_12_14_225241_create_jobs_table.php | 4 +- ..._12_14_225337_create_failed_jobs_table.php | 4 +- ...017_12_20_004147_create_navdata_tables.php | 4 +- .../2017_12_20_005147_create_acars_tables.php | 4 +- .../2018_01_08_142204_create_news_table.php | 4 +- app/Events/PirepAccepted.php | 4 +- app/Events/PirepFiled.php | 4 +- app/Events/PirepRejected.php | 4 +- app/Events/TestEvent.php | 4 +- app/Events/UserAccepted.php | 4 +- app/Events/UserRegistered.php | 4 +- app/Events/UserStateChanged.php | 4 +- app/Events/UserStatsChanged.php | 4 +- app/Exceptions/Handler.php | 6 +-- app/Exceptions/SettingNotFound.php | 1 - app/Facades/Utils.php | 2 +- .../Controllers/Admin/AircraftController.php | 8 ++- .../Controllers/Admin/AirlinesController.php | 22 +++++---- .../Controllers/Admin/AirportController.php | 19 ++++--- .../Controllers/Admin/DashboardController.php | 18 ++++--- app/Http/Controllers/Admin/FareController.php | 28 +++++------ .../Controllers/Admin/FlightController.php | 34 ++++++++----- .../Controllers/Admin/PirepController.php | 42 +++++++++------- .../Admin/PirepFieldController.php | 21 +++++--- app/Http/Controllers/Admin/RankController.php | 47 +++++++++++------- .../Controllers/Admin/SettingsController.php | 8 +-- .../Controllers/Admin/SubfleetController.php | 23 +++------ app/Http/Controllers/Admin/UserController.php | 49 +++++++++---------- app/Http/Controllers/Api/AcarsController.php | 13 +++-- .../Controllers/Api/AirlineController.php | 15 ++++-- .../Controllers/Api/AirportController.php | 17 +++++-- app/Http/Controllers/Api/FleetController.php | 13 +++-- app/Http/Controllers/Api/FlightController.php | 16 +++--- app/Http/Controllers/Api/PirepController.php | 45 ++++++++--------- app/Http/Controllers/Api/RestController.php | 6 --- .../Controllers/Api/SettingsController.php | 15 ++++-- app/Http/Controllers/Api/StatusController.php | 3 ++ app/Http/Controllers/Api/UserController.php | 32 +++++++----- .../Auth/ForgotPasswordController.php | 6 +++ app/Http/Controllers/Auth/LoginController.php | 15 ++++-- .../Controllers/Auth/RegisterController.php | 34 +++++++------ .../Auth/ResetPasswordController.php | 8 ++- app/Http/Controllers/Controller.php | 6 +-- .../Controllers/Frontend/AcarsController.php | 11 +++-- .../Frontend/DashboardController.php | 9 ++-- .../Controllers/Frontend/FlightController.php | 35 +++++++++---- .../Controllers/Frontend/HomeController.php | 2 +- .../Controllers/Frontend/PirepController.php | 41 ++++++++++------ .../Frontend/ProfileController.php | 44 ++++++++++++----- .../Controllers/Frontend/UserController.php | 10 ++-- app/Http/Middleware/ApiAuth.php | 5 +- app/Http/Middleware/VerifyCsrfToken.php | 2 - app/Http/Requests/Acars/EventRequest.php | 2 +- app/Http/Requests/Acars/FileRequest.php | 2 +- app/Http/Requests/Acars/LogRequest.php | 2 +- app/Http/Requests/Acars/PositionRequest.php | 2 +- app/Http/Requests/Acars/UpdateRequest.php | 2 +- app/Http/Requests/CreateAircraftRequest.php | 2 +- app/Http/Requests/CreateAirlineRequest.php | 2 +- app/Http/Requests/CreateFareRequest.php | 2 +- app/Http/Requests/CreatePirepRequest.php | 5 +- app/Http/Requests/UpdateAirlineRequest.php | 2 +- app/Http/Requests/UpdateFareRequest.php | 2 +- app/Http/Requests/UpdatePirepFieldRequest.php | 1 - app/Http/Requests/UpdatePirepRequest.php | 1 - app/Listeners/NotificationEventListener.php | 5 +- app/Mail/NewLoginDetails.php | 2 +- app/Mail/UserPending.php | 2 +- app/Models/Enums/PirepSource.php | 7 --- app/Models/Enums/PirepState.php | 1 - app/Models/Enums/PirepStatus.php | 1 - app/Models/Fare.php | 1 - app/Models/Flight.php | 3 +- app/Models/GeoJson.php | 8 +-- app/Models/Migrations/Migration.php | 2 +- app/Models/Pirep.php | 1 - app/Models/Traits/HashId.php | 1 - app/Models/User.php | 4 +- app/Providers/AppServiceProvider.php | 3 +- app/Providers/AuthServiceProvider.php | 1 - app/Providers/BroadcastServiceProvider.php | 2 +- app/Providers/EventServiceProvider.php | 2 +- app/Providers/RouteServiceProvider.php | 2 +- app/Repositories/AcarsRepository.php | 2 +- app/Repositories/AircraftRepository.php | 2 +- app/Repositories/AirlineRepository.php | 2 +- app/Repositories/AirportRepository.php | 2 +- app/Repositories/BaseRepository.php | 1 - app/Repositories/FareRepository.php | 2 +- app/Repositories/FlightRepository.php | 7 ++- app/Repositories/NavdataRepository.php | 2 +- app/Repositories/NewsRepository.php | 2 +- app/Repositories/RankRepository.php | 2 +- app/Repositories/SettingRepository.php | 12 ++--- app/Repositories/SubfleetRepository.php | 2 +- app/Repositories/UserRepository.php | 5 +- app/Services/AnalyticsService.php | 5 +- app/Services/DatabaseService.php | 5 +- app/Services/FlightService.php | 4 +- app/Services/GeoService.php | 19 +++---- app/Services/ModuleService.php | 7 --- app/Services/PIREPService.php | 29 +++++------ app/Services/UserService.php | 16 +++--- app/Support/Units/Altitude.php | 1 + app/Support/Units/Distance.php | 1 + app/Support/Units/Fuel.php | 1 + app/Support/Units/Mass.php | 1 + app/Support/Units/Time.php | 1 + app/Support/Units/Velocity.php | 1 + app/Support/Units/Volume.php | 1 + app/Widgets/BaseWidget.php | 6 --- app/Widgets/LatestNews.php | 4 ++ app/Widgets/LatestPilots.php | 4 ++ app/Widgets/LatestPireps.php | 4 ++ app/Widgets/LiveMap.php | 4 ++ tests/ApiTest.php | 2 +- tests/FinanceTest.php | 3 -- tests/GeoTest.php | 2 - tests/PIREPTest.php | 5 +- tests/RegistrationTest.php | 3 +- tests/UserTest.php | 5 +- 138 files changed, 600 insertions(+), 508 deletions(-) diff --git a/app/Bootstrap/LoadConfiguration.php b/app/Bootstrap/LoadConfiguration.php index 1eb3138f..4f135e32 100644 --- a/app/Bootstrap/LoadConfiguration.php +++ b/app/Bootstrap/LoadConfiguration.php @@ -2,8 +2,8 @@ namespace App\Bootstrap; -use Illuminate\Contracts\Foundation\Application; use Illuminate\Contracts\Config\Repository as RepositoryContract; +use Illuminate\Contracts\Foundation\Application; /** * Class LoadConfiguration diff --git a/app/Console/Commands/AcarsReplay.php b/app/Console/Commands/AcarsReplay.php index 107a17ca..17435de9 100644 --- a/app/Console/Commands/AcarsReplay.php +++ b/app/Console/Commands/AcarsReplay.php @@ -2,11 +2,10 @@ namespace App\Console\Commands; -use Illuminate\Database\Eloquent\Collection; -use GuzzleHttp\Client; - use App\Console\BaseCommand; use App\Facades\Utils; +use GuzzleHttp\Client; +use Illuminate\Database\Eloquent\Collection; class AcarsReplay extends BaseCommand { diff --git a/app/Console/Commands/CreateDatabase.php b/app/Console/Commands/CreateDatabase.php index 24192733..7d29a875 100644 --- a/app/Console/Commands/CreateDatabase.php +++ b/app/Console/Commands/CreateDatabase.php @@ -2,9 +2,8 @@ namespace App\Console\Commands; -use Log; - use App\Console\BaseCommand; +use Log; class CreateDatabase extends BaseCommand { diff --git a/app/Console/Commands/DevCommands.php b/app/Console/Commands/DevCommands.php index 31f0f0f9..d181fab5 100644 --- a/app/Console/Commands/DevCommands.php +++ b/app/Console/Commands/DevCommands.php @@ -2,15 +2,13 @@ namespace App\Console\Commands; -use DB; -use PDO; - -use App\Models\Airline; -use App\Models\User; - use App\Console\BaseCommand; use App\Models\Acars; +use App\Models\Airline; use App\Models\Pirep; +use App\Models\User; +use DB; +use PDO; class DevCommands extends BaseCommand { diff --git a/app/Console/Commands/ImportCommand.php b/app/Console/Commands/ImportCommand.php index bd5a5be3..314dcf5b 100644 --- a/app/Console/Commands/ImportCommand.php +++ b/app/Console/Commands/ImportCommand.php @@ -2,7 +2,6 @@ namespace App\Console\Commands; -use DB; use App\Console\BaseCommand; use App\Services\DatabaseService; diff --git a/app/Console/Commands/Importer.php b/app/Console/Commands/Importer.php index f12bf578..e5f442e0 100644 --- a/app/Console/Commands/Importer.php +++ b/app/Console/Commands/Importer.php @@ -2,7 +2,6 @@ namespace App\Console\Commands; -use DB; use App\Console\BaseCommand; class Importer extends BaseCommand diff --git a/app/Console/Commands/NavdataCommand.php b/app/Console/Commands/NavdataCommand.php index c77a9690..35a2008c 100644 --- a/app/Console/Commands/NavdataCommand.php +++ b/app/Console/Commands/NavdataCommand.php @@ -3,9 +3,8 @@ namespace App\Console\Commands; use App\Console\BaseCommand; -use App\Models\Navdata; use App\Models\Enums\NavaidType; - +use App\Models\Navdata; class NavdataCommand extends BaseCommand { diff --git a/app/Console/Commands/TestApi.php b/app/Console/Commands/TestApi.php index b80559c4..019722a9 100644 --- a/app/Console/Commands/TestApi.php +++ b/app/Console/Commands/TestApi.php @@ -2,8 +2,8 @@ namespace App\Console\Commands; -use GuzzleHttp\Client; use App\Console\BaseCommand; +use GuzzleHttp\Client; class TestApi extends BaseCommand { diff --git a/app/Console/Services/Database.php b/app/Console/Services/Database.php index c13844f4..86da3d27 100644 --- a/app/Console/Services/Database.php +++ b/app/Console/Services/Database.php @@ -2,8 +2,8 @@ namespace App\Console\Services; -use PDO; use Doctrine\DBAL\Driver\PDOException; +use PDO; /** * Class Database diff --git a/app/Console/Services/Importer.php b/app/Console/Services/Importer.php index a69242aa..41b7eb3c 100644 --- a/app/Console/Services/Importer.php +++ b/app/Console/Services/Importer.php @@ -2,26 +2,25 @@ namespace App\Console\Services; -use PDO; -use Carbon\Carbon; -use Doctrine\DBAL\Driver\PDOException; -use Illuminate\Support\Str; -use Illuminate\Database\QueryException; -use Illuminate\Support\Facades\Hash; -use Symfony\Component\Console\Output\ConsoleOutput; - -use App\Models\Enums\FlightType; -use App\Models\Enums\PirepSource; -use App\Models\Pirep; +use App\Facades\Utils; use App\Models\Aircraft; use App\Models\Airline; use App\Models\Airport; +use App\Models\Enums\FlightType; +use App\Models\Enums\PirepSource; +use App\Models\Enums\UserState; use App\Models\Flight; +use App\Models\Pirep; use App\Models\Rank; use App\Models\Subfleet; use App\Models\User; -use App\Models\Enums\UserState; -use App\Facades\Utils; +use Carbon\Carbon; +use Doctrine\DBAL\Driver\PDOException; +use Illuminate\Database\QueryException; +use Illuminate\Support\Facades\Hash; +use Illuminate\Support\Str; +use PDO; +use Symfony\Component\Console\Output\ConsoleOutput; /** * Class Importer diff --git a/app/Database/migrations/2017_06_08_0000_create_users_table.php b/app/Database/migrations/2017_06_08_0000_create_users_table.php index 93fce01b..643e5730 100755 --- a/app/Database/migrations/2017_06_08_0000_create_users_table.php +++ b/app/Database/migrations/2017_06_08_0000_create_users_table.php @@ -1,8 +1,8 @@ airlineRepo = $airlinesRepo; } @@ -59,9 +63,7 @@ class AirlinesController extends BaseController /** * Display the specified Airlines. - * * @param int $id - * * @return mixed */ public function show($id) diff --git a/app/Http/Controllers/Admin/AirportController.php b/app/Http/Controllers/Admin/AirportController.php index 98f52e72..03b213ce 100644 --- a/app/Http/Controllers/Admin/AirportController.php +++ b/app/Http/Controllers/Admin/AirportController.php @@ -2,12 +2,11 @@ namespace App\Http\Controllers\Admin; -use Log; -use Flash; use App\Http\Requests\CreateAirportRequest; use App\Http\Requests\UpdateAirportRequest; use App\Repositories\AirportRepository; use App\Repositories\Criteria\WhereCriteria; +use Flash; use Illuminate\Http\Request; use Jackiedo\Timezonelist\Facades\Timezonelist; use Response; @@ -18,14 +17,18 @@ class AirportController extends BaseController /** @var AirportRepository */ private $airportRepository; - public function __construct(AirportRepository $airportRepo) - { + /** + * AirportController constructor. + * @param AirportRepository $airportRepo + */ + public function __construct( + AirportRepository $airportRepo + ) { $this->airportRepository = $airportRepo; } /** * Display a listing of the Airport. - * * @param Request $request * @return Response * @throws \Prettus\Repository\Exceptions\RepositoryException @@ -47,7 +50,6 @@ class AirportController extends BaseController /** * Show the form for creating a new Airport. - * * @return Response */ public function create() @@ -158,6 +160,11 @@ class AirportController extends BaseController return redirect(route('admin.airports.index')); } + /** + * Set fuel prices for this airport + * @param Request $request + * @return mixed + */ public function fuel(Request $request) { $id = $request->id; diff --git a/app/Http/Controllers/Admin/DashboardController.php b/app/Http/Controllers/Admin/DashboardController.php index 248e376c..29b8bb77 100644 --- a/app/Http/Controllers/Admin/DashboardController.php +++ b/app/Http/Controllers/Admin/DashboardController.php @@ -2,23 +2,27 @@ namespace App\Http\Controllers\Admin; -use Auth; -use Flash; -use Log; -use Version; -use Illuminate\Http\Request; - use App\Facades\Utils; use App\Repositories\NewsRepository; use App\Repositories\PirepRepository; use App\Repositories\UserRepository; - +use Auth; +use Flash; +use Illuminate\Http\Request; +use Log; +use Version; use vierbergenlars\SemVer\version as semver; class DashboardController extends BaseController { private $newsRepo, $pirepRepo, $userRepo; + /** + * DashboardController constructor. + * @param NewsRepository $newsRepo + * @param PirepRepository $pirepRepo + * @param UserRepository $userRepo + */ public function __construct( NewsRepository $newsRepo, PirepRepository $pirepRepo, diff --git a/app/Http/Controllers/Admin/FareController.php b/app/Http/Controllers/Admin/FareController.php index 7179e731..1afd6320 100644 --- a/app/Http/Controllers/Admin/FareController.php +++ b/app/Http/Controllers/Admin/FareController.php @@ -5,8 +5,8 @@ namespace App\Http\Controllers\Admin; use App\Http\Requests\CreateFareRequest; use App\Http\Requests\UpdateFareRequest; use App\Repositories\FareRepository; -use Illuminate\Http\Request; use Flash; +use Illuminate\Http\Request; use Prettus\Repository\Criteria\RequestCriteria; use Response; @@ -15,17 +15,21 @@ class FareController extends BaseController /** @var FareRepository */ private $fareRepository; - public function __construct(FareRepository $fareRepo) - { + /** + * FareController constructor. + * @param FareRepository $fareRepo + */ + public function __construct( + FareRepository $fareRepo + ) { $this->fareRepository = $fareRepo; } /** * Display a listing of the Fare. - * * @param Request $request - * * @return Response + * @throws \Prettus\Repository\Exceptions\RepositoryException */ public function index(Request $request) { @@ -48,10 +52,9 @@ class FareController extends BaseController /** * Store a newly created Fare in storage. - * * @param CreateFareRequest $request - * * @return Response + * @throws \Prettus\Validator\Exceptions\ValidatorException */ public function store(CreateFareRequest $request) { @@ -64,9 +67,7 @@ class FareController extends BaseController /** * Display the specified Fare. - * * @param int $id - * * @return Response */ public function show($id) @@ -82,9 +83,7 @@ class FareController extends BaseController /** * Show the form for editing the specified Fare. - * * @param int $id - * * @return Response */ public function edit($id) @@ -100,11 +99,10 @@ 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 */ public function update($id, UpdateFareRequest $request) { @@ -122,9 +120,7 @@ class FareController extends BaseController /** * Remove the specified Fare from storage. - * * @param int $id - * * @return Response */ public function destroy($id) diff --git a/app/Http/Controllers/Admin/FlightController.php b/app/Http/Controllers/Admin/FlightController.php index 240245e8..eb63c2fd 100644 --- a/app/Http/Controllers/Admin/FlightController.php +++ b/app/Http/Controllers/Admin/FlightController.php @@ -2,24 +2,21 @@ namespace App\Http\Controllers\Admin; -use App\Facades\Utils; +use App\Http\Requests\CreateFlightRequest; +use App\Http\Requests\UpdateFlightRequest; use App\Models\Enums\FlightType; use App\Models\Flight; use App\Models\FlightFields; -use App\Http\Requests\CreateFlightRequest; -use App\Http\Requests\UpdateFlightRequest; use App\Repositories\AirlineRepository; use App\Repositories\AirportRepository; use App\Repositories\FareRepository; use App\Repositories\FlightRepository; use App\Repositories\SubfleetRepository; - use App\Services\FareService; use App\Services\FlightService; - use App\Support\Units\Time; -use Illuminate\Http\Request; use Flash; +use Illuminate\Http\Request; use Response; class FlightController extends BaseController @@ -32,6 +29,16 @@ class FlightController extends BaseController $flightSvc, $subfleetRepo; + /** + * FlightController constructor. + * @param AirlineRepository $airlineRepo + * @param AirportRepository $airportRepo + * @param FareRepository $fareRepo + * @param FlightRepository $flightRepo + * @param FareService $fareSvc + * @param FlightService $flightSvc + * @param SubfleetRepository $subfleetRepo + */ public function __construct( AirlineRepository $airlineRepo, AirportRepository $airportRepo, @@ -50,6 +57,10 @@ class FlightController extends BaseController $this->subfleetRepo = $subfleetRepo; } + /** + * @param $flight + * @return array + */ protected function getAvailSubfleets($flight) { $retval = []; @@ -82,7 +93,6 @@ class FlightController extends BaseController /** * Show the form for creating a new Flight. - * * @return Response */ public function create() @@ -136,7 +146,7 @@ class FlightController extends BaseController /** * @param $id - * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View + * @return mixed */ public function show($id) { @@ -156,7 +166,7 @@ class FlightController extends BaseController /** * @param $id - * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View + * @return mixed */ public function edit($id) { @@ -252,7 +262,7 @@ class FlightController extends BaseController /** * @param $flight - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + * @return mixed */ protected function return_fields_view($flight) { @@ -264,7 +274,7 @@ class FlightController extends BaseController /** * @param Request $request - * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View + * @return mixed */ public function fields(Request $request) { @@ -316,7 +326,7 @@ class FlightController extends BaseController /** * @param $id * @param Request $request - * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View + * @return mixed */ public function subfleets($id, Request $request) { diff --git a/app/Http/Controllers/Admin/PirepController.php b/app/Http/Controllers/Admin/PirepController.php index 4c4f72c4..8524a3d1 100644 --- a/app/Http/Controllers/Admin/PirepController.php +++ b/app/Http/Controllers/Admin/PirepController.php @@ -2,30 +2,25 @@ namespace App\Http\Controllers\Admin; -use App\Services\UserService; -use App\Support\Units\Time; -use Log; -use Flash; -use Response; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Auth; -use Prettus\Repository\Criteria\RequestCriteria; - -use App\Services\PIREPService; - -use App\Models\PirepComment; -use App\Models\Enums\PirepState; - +use App\Facades\Utils; use App\Http\Requests\CreatePirepRequest; use App\Http\Requests\UpdatePirepRequest; - +use App\Models\Enums\PirepState; +use App\Models\PirepComment; use App\Repositories\AircraftRepository; use App\Repositories\AirlineRepository; use App\Repositories\AirportRepository; use App\Repositories\PirepRepository; use App\Repositories\SubfleetRepository; - -use App\Facades\Utils; +use App\Services\PIREPService; +use App\Services\UserService; +use App\Support\Units\Time; +use Flash; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; +use Log; +use Prettus\Repository\Criteria\RequestCriteria; +use Response; class PirepController extends BaseController @@ -38,6 +33,16 @@ class PirepController extends BaseController $subfleetRepo, $userSvc; + /** + * PirepController constructor. + * @param AirportRepository $airportRepo + * @param AirlineRepository $airlineRepo + * @param AircraftRepository $aircraftRepo + * @param PirepRepository $pirepRepo + * @param PIREPService $pirepSvc + * @param SubfleetRepository $subfleetRepo + * @param UserService $userSvc + */ public function __construct( AirportRepository $airportRepo, AirlineRepository $airlineRepo, @@ -284,7 +289,8 @@ class PirepController extends BaseController * Add a comment to the Pirep * @param $id * @param Request $request - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + * @return mixed + * @throws \Exception */ public function comments($id, Request $request) { diff --git a/app/Http/Controllers/Admin/PirepFieldController.php b/app/Http/Controllers/Admin/PirepFieldController.php index 793e5e99..b8da65d7 100644 --- a/app/Http/Controllers/Admin/PirepFieldController.php +++ b/app/Http/Controllers/Admin/PirepFieldController.php @@ -5,8 +5,8 @@ namespace App\Http\Controllers\Admin; use App\Http\Requests\CreatePirepFieldRequest; use App\Http\Requests\UpdatePirepFieldRequest; use App\Repositories\PirepFieldRepository; -use Illuminate\Http\Request; use Flash; +use Illuminate\Http\Request; use Prettus\Repository\Criteria\RequestCriteria; use Response; @@ -15,8 +15,13 @@ class PirepFieldController extends BaseController /** @var PirepFieldRepository */ private $pirepFieldRepo; - public function __construct(PirepFieldRepository $pirepFieldRepo) - { + /** + * PirepFieldController constructor. + * @param PirepFieldRepository $pirepFieldRepo + */ + public function __construct( + PirepFieldRepository $pirepFieldRepo + ){ $this->pirepFieldRepo = $pirepFieldRepo; } @@ -59,7 +64,7 @@ class PirepFieldController extends BaseController $this->pirepFieldRepo->create($attrs); - Flash::success('PirepField saved successfully.'); + Flash::success('Field added successfully.'); return redirect(route('admin.pirepfields.index')); } @@ -92,7 +97,7 @@ class PirepFieldController extends BaseController $field = $this->pirepFieldRepo->findWithoutFail($id); if (empty($field)) { - Flash::error('PirepField not found'); + Flash::error('Field not found'); return redirect(route('admin.pirepfields.index')); } @@ -119,7 +124,7 @@ class PirepFieldController extends BaseController $attrs['required'] = get_truth_state($attrs['required']); $this->pirepFieldRepo->update($attrs, $id); - Flash::success('PirepField updated successfully.'); + Flash::success('Field updated successfully.'); return redirect(route('admin.pirepfields.index')); } @@ -133,13 +138,13 @@ class PirepFieldController extends BaseController $field = $this->pirepFieldRepo->findWithoutFail($id); if (empty($field)) { - Flash::error('PirepField not found'); + Flash::error('Field not found'); return redirect(route('admin.pirepfields.index')); } $this->pirepFieldRepo->delete($id); - Flash::success('PirepField deleted successfully.'); + Flash::success('Field deleted successfully.'); return redirect(route('admin.pirepfields.index')); } } diff --git a/app/Http/Controllers/Admin/RankController.php b/app/Http/Controllers/Admin/RankController.php index a2dd548e..5c2b2442 100644 --- a/app/Http/Controllers/Admin/RankController.php +++ b/app/Http/Controllers/Admin/RankController.php @@ -2,22 +2,26 @@ namespace App\Http\Controllers\Admin; -use Cache; -use Flash; -use Response; -use Illuminate\Http\Request; -use Prettus\Repository\Criteria\RequestCriteria; - use App\Http\Requests\CreateRankRequest; use App\Http\Requests\UpdateRankRequest; use App\Repositories\RankRepository; use App\Repositories\SubfleetRepository; +use Cache; +use Flash; +use Illuminate\Http\Request; +use Prettus\Repository\Criteria\RequestCriteria; +use Response; class RankController extends BaseController { /** @var RankRepository */ private $rankRepository, $subfleetRepo; + /** + * RankController constructor. + * @param RankRepository $rankingRepo + * @param SubfleetRepository $subfleetRepo + */ public function __construct( RankRepository $rankingRepo, SubfleetRepository $subfleetRepo @@ -26,6 +30,11 @@ class RankController extends BaseController $this->subfleetRepo = $subfleetRepo; } + /** + * Get the available subfleets for a rank + * @param $rank + * @return array + */ protected function getAvailSubfleets($rank) { $retval = []; @@ -69,6 +78,7 @@ class RankController extends BaseController * Store a newly created Ranking in storage. * @param CreateRankRequest $request * @return Response + * @throws \Prettus\Validator\Exceptions\ValidatorException */ public function store(CreateRankRequest $request) { @@ -84,9 +94,7 @@ class RankController extends BaseController /** * Display the specified Ranking. - * * @param int $id - * * @return Response */ public function show($id) @@ -105,9 +113,7 @@ class RankController extends BaseController /** * Show the form for editing the specified Ranking. - * * @param int $id - * * @return Response */ public function edit($id) @@ -128,11 +134,10 @@ class RankController extends BaseController /** * Update the specified Ranking in storage. - * - * @param int $id + * @param int $id * @param UpdateRankRequest $request - * * @return Response + * @throws \Prettus\Validator\Exceptions\ValidatorException */ public function update($id, UpdateRankRequest $request) { @@ -152,9 +157,7 @@ class RankController extends BaseController /** * Remove the specified Ranking from storage. - * * @param int $id - * * @return Response */ public function destroy($id) @@ -172,6 +175,10 @@ class RankController extends BaseController return redirect(route('admin.ranks.index')); } + /** + * @param $rank + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ protected function return_subfleet_view($rank) { $avail_subfleets = $this->getAvailSubfleets($rank); @@ -181,10 +188,14 @@ class RankController extends BaseController ]); } - public function subfleets(Request $request) + /** + * Subfleet operations on a rank + * @param $id + * @param Request $request + * @return mixed + */ + public function subfleets($id, Request $request) { - $id = $request->id; - $rank = $this->rankRepository->findWithoutFail($id); if (empty($rank)) { Flash::error('Rank not found!'); diff --git a/app/Http/Controllers/Admin/SettingsController.php b/app/Http/Controllers/Admin/SettingsController.php index 7cbbd8e6..3f339db6 100644 --- a/app/Http/Controllers/Admin/SettingsController.php +++ b/app/Http/Controllers/Admin/SettingsController.php @@ -2,10 +2,9 @@ namespace App\Http\Controllers\Admin; -use Log; -use Illuminate\Http\Request; - use App\Models\Setting; +use Illuminate\Http\Request; +use Log; class SettingsController extends BaseController { @@ -24,6 +23,8 @@ class SettingsController extends BaseController /** * Update the specified setting in storage. + * @param Request $request + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ public function update(Request $request) { @@ -41,5 +42,4 @@ class SettingsController extends BaseController flash('Settings saved!'); return redirect('/admin/settings'); } - } diff --git a/app/Http/Controllers/Admin/SubfleetController.php b/app/Http/Controllers/Admin/SubfleetController.php index 2851a2fb..bcae7542 100644 --- a/app/Http/Controllers/Admin/SubfleetController.php +++ b/app/Http/Controllers/Admin/SubfleetController.php @@ -2,25 +2,20 @@ namespace App\Http\Controllers\Admin; -use App\Repositories\RankRepository; -use Illuminate\Http\Request; -use Flash; -use Prettus\Repository\Criteria\RequestCriteria; -use Response; - -use App\Models\Enums\FuelType; - -use App\Models\Airline; -use App\Models\Subfleet; - use App\Http\Requests\CreateSubfleetRequest; use App\Http\Requests\UpdateSubfleetRequest; - +use App\Models\Airline; +use App\Models\Enums\FuelType; +use App\Models\Subfleet; use App\Repositories\AircraftRepository; use App\Repositories\FareRepository; +use App\Repositories\RankRepository; use App\Repositories\SubfleetRepository; - use App\Services\FareService; +use Flash; +use Illuminate\Http\Request; +use Prettus\Repository\Criteria\RequestCriteria; +use Response; class SubfleetController extends BaseController { @@ -29,7 +24,6 @@ class SubfleetController extends BaseController /** * SubfleetController constructor. - * * @param AircraftRepository $aircraftRepo * @param SubfleetRepository $subfleetRepo * @param FareRepository $fareRepo @@ -102,7 +96,6 @@ class SubfleetController extends BaseController /** * Show the form for creating a new Subfleet. - * * @return Response */ public function create() diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index cdda8f09..3eb79cf2 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -3,28 +3,24 @@ namespace App\Http\Controllers\Admin; use App\Facades\Utils; -use App\Models\User; -use DB; -use Hash; -use Illuminate\Support\Facades\Auth; -use Log; -use Flash; -use Prettus\Repository\Exceptions\RepositoryException; -use Response; -use Jackiedo\Timezonelist\Facades\Timezonelist; -use Illuminate\Http\Request; - use App\Http\Requests\CreateUserRequest; use App\Http\Requests\UpdateUserRequest; - +use App\Models\Airline; +use App\Models\Airport; +use App\Models\Rank; +use App\Models\Role; +use App\Models\User; use App\Repositories\PirepRepository; use App\Repositories\UserRepository; use App\Services\UserService; - -use App\Models\Airport; -use App\Models\Airline; -use App\Models\Rank; -use App\Models\Role; +use DB; +use Flash; +use Hash; +use Illuminate\Http\Request; +use Jackiedo\Timezonelist\Facades\Timezonelist; +use Log; +use Prettus\Repository\Exceptions\RepositoryException; +use Response; class UserController extends BaseController { @@ -34,7 +30,6 @@ class UserController extends BaseController /** * UserController constructor. - * * @param UserRepository $userRepo */ public function __construct( @@ -47,6 +42,10 @@ class UserController extends BaseController $this->userRepo = $userRepo; } + /** + * @param Request $request + * @return mixed + */ public function index(Request $request) { try { @@ -82,7 +81,7 @@ class UserController extends BaseController public function store(CreateUserRequest $request) { $input = $request->all(); - $User = $this->userRepo->create($input); + $user = $this->userRepo->create($input); Flash::success('User saved successfully.'); return redirect(route('admin.users.index')); @@ -120,9 +119,7 @@ class UserController extends BaseController /** * Show the form for editing the specified User. - * * @param int $id - * * @return Response */ public function edit($id) @@ -157,11 +154,10 @@ class UserController extends BaseController /** * Update the specified User in storage. - * - * @param int $id + * @param int $id * @param UpdateUserRequest $request - * * @return Response + * @throws \Prettus\Validator\Exceptions\ValidatorException */ public function update($id, UpdateUserRequest $request) { @@ -199,9 +195,7 @@ class UserController extends BaseController /** * Remove the specified User from storage. - * * @param int $id - * * @return Response */ public function destroy($id) @@ -221,6 +215,9 @@ class UserController extends BaseController /** * Regenerate the user's API key + * @param $id + * @param Request $request + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ public function regen_apikey($id, Request $request) { diff --git a/app/Http/Controllers/Api/AcarsController.php b/app/Http/Controllers/Api/AcarsController.php index 51d1fefd..935e9145 100644 --- a/app/Http/Controllers/Api/AcarsController.php +++ b/app/Http/Controllers/Api/AcarsController.php @@ -2,17 +2,22 @@ namespace App\Http\Controllers\Api; -use Illuminate\Http\Request; - -use App\Services\GeoService; use App\Repositories\AcarsRepository; use App\Repositories\PirepRepository; +use App\Services\GeoService; +use Illuminate\Http\Request; class AcarsController extends RestController { protected $acarsRepo, $geoSvc, $pirepRepo; + /** + * AcarsController constructor. + * @param GeoService $geoSvc + * @param AcarsRepository $acarsRepo + * @param PirepRepository $pirepRepo + */ public function __construct( GeoService $geoSvc, AcarsRepository $acarsRepo, @@ -25,6 +30,8 @@ class AcarsController extends RestController /** * Return all of the flights (as points) in GeoJSON format + * @param Request $request + * @return mixed */ public function index(Request $request) { diff --git a/app/Http/Controllers/Api/AirlineController.php b/app/Http/Controllers/Api/AirlineController.php index 341ffd1f..d9882a6b 100644 --- a/app/Http/Controllers/Api/AirlineController.php +++ b/app/Http/Controllers/Api/AirlineController.php @@ -2,21 +2,28 @@ namespace App\Http\Controllers\Api; -use Illuminate\Http\Request; - -use App\Repositories\AirlineRepository; use App\Http\Resources\Airline as AirlineResource; +use App\Repositories\AirlineRepository; +use Illuminate\Http\Request; class AirlineController extends RestController { protected $airlineRepo; - public function __construct(AirlineRepository $airlineRepo) { + /** + * AirlineController constructor. + * @param AirlineRepository $airlineRepo + */ + public function __construct( + AirlineRepository $airlineRepo + ) { $this->airlineRepo = $airlineRepo; } /** * Return all the airlines, paginated + * @param Request $request + * @return mixed */ public function index(Request $request) { diff --git a/app/Http/Controllers/Api/AirportController.php b/app/Http/Controllers/Api/AirportController.php index 422d2dbd..972ccdbe 100644 --- a/app/Http/Controllers/Api/AirportController.php +++ b/app/Http/Controllers/Api/AirportController.php @@ -2,19 +2,21 @@ namespace App\Http\Controllers\Api; -use Log; +use App\Http\Resources\Airport as AirportResource; +use App\Repositories\AirportRepository; use Illuminate\Http\Request; use Illuminate\Support\Facades\Cache; - -use App\Repositories\AirportRepository; -use App\Http\Resources\Airport as AirportResource; - +use Log; use VaCentral\Airport as AirportLookup; class AirportController extends RestController { protected $airportRepo; + /** + * AirportController constructor. + * @param AirportRepository $airportRepo + */ public function __construct( AirportRepository $airportRepo ) { @@ -23,6 +25,8 @@ class AirportController extends RestController /** * Return all the airports, paginated + * @param Request $request + * @return mixed */ public function index(Request $request) { @@ -38,6 +42,9 @@ class AirportController extends RestController return AirportResource::collection($airports); } + /** + * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection + */ public function index_hubs() { $where = [ diff --git a/app/Http/Controllers/Api/FleetController.php b/app/Http/Controllers/Api/FleetController.php index 5983fa8c..5b727636 100644 --- a/app/Http/Controllers/Api/FleetController.php +++ b/app/Http/Controllers/Api/FleetController.php @@ -2,18 +2,21 @@ namespace App\Http\Controllers\Api; -use Illuminate\Http\Request; - -use App\Repositories\AircraftRepository; -use App\Repositories\SubfleetRepository; - use App\Http\Resources\Aircraft as AircraftResource; use App\Http\Resources\Subfleet as SubfleetResource; +use App\Repositories\AircraftRepository; +use App\Repositories\SubfleetRepository; +use Illuminate\Http\Request; class FleetController extends RestController { protected $aircraftRepo, $subfleetRepo; + /** + * FleetController constructor. + * @param AircraftRepository $aircraftRepo + * @param SubfleetRepository $subfleetRepo + */ public function __construct( AircraftRepository $aircraftRepo, SubfleetRepository $subfleetRepo diff --git a/app/Http/Controllers/Api/FlightController.php b/app/Http/Controllers/Api/FlightController.php index 7bd86285..3b70ee3c 100644 --- a/app/Http/Controllers/Api/FlightController.php +++ b/app/Http/Controllers/Api/FlightController.php @@ -2,19 +2,17 @@ namespace App\Http\Controllers\Api; +use App\Http\Resources\Flight as FlightResource; +use App\Http\Resources\Navdata as NavdataResource; use App\Repositories\Criteria\WhereCriteria; +use App\Repositories\FlightRepository; use App\Services\FlightService; +use App\Services\UserService; use Auth; use Illuminate\Http\Request; use Prettus\Repository\Criteria\RequestCriteria; use Prettus\Repository\Exceptions\RepositoryException; -use App\Services\UserService; -use App\Repositories\FlightRepository; - -use App\Http\Resources\Flight as FlightResource; -use App\Http\Resources\Navdata as NavdataResource; - /** * Class FlightController * @package App\Http\Controllers\Api @@ -23,6 +21,12 @@ class FlightController extends RestController { protected $flightRepo, $flightSvc, $userSvc; + /** + * FlightController constructor. + * @param FlightRepository $flightRepo + * @param FlightService $flightSvc + * @param UserService $userSvc + */ public function __construct( FlightRepository $flightRepo, FlightService $flightSvc, diff --git a/app/Http/Controllers/Api/PirepController.php b/app/Http/Controllers/Api/PirepController.php index cbb33bc5..1df259fa 100644 --- a/app/Http/Controllers/Api/PirepController.php +++ b/app/Http/Controllers/Api/PirepController.php @@ -2,38 +2,32 @@ namespace App\Http\Controllers\Api; -use App\Http\Requests\Acars\EventRequest; -use App\Http\Requests\Acars\UpdateRequest; -use App\Models\Enums\PirepSource; -use App\Services\UserService; -use Auth; -use Log; -use Illuminate\Http\Request; - use App\Http\Requests\Acars\CommentRequest; +use App\Http\Requests\Acars\EventRequest; use App\Http\Requests\Acars\FileRequest; use App\Http\Requests\Acars\LogRequest; use App\Http\Requests\Acars\PositionRequest; use App\Http\Requests\Acars\PrefileRequest; use App\Http\Requests\Acars\RouteRequest; - -use App\Models\Acars; -use App\Models\Pirep; -use App\Models\PirepComment; - -use App\Models\Enums\AcarsType; -use App\Models\Enums\PirepState; -use App\Models\Enums\PirepStatus; - -use App\Services\GeoService; -use App\Services\PIREPService; -use App\Repositories\AcarsRepository; -use App\Repositories\PirepRepository; - +use App\Http\Requests\Acars\UpdateRequest; +use App\Http\Resources\AcarsRoute as AcarsRouteResource; use App\Http\Resources\Pirep as PirepResource; use App\Http\Resources\PirepComment as PirepCommentResource; -use App\Http\Resources\AcarsRoute as AcarsRouteResource; - +use App\Models\Acars; +use App\Models\Enums\AcarsType; +use App\Models\Enums\PirepSource; +use App\Models\Enums\PirepState; +use App\Models\Enums\PirepStatus; +use App\Models\Pirep; +use App\Models\PirepComment; +use App\Repositories\AcarsRepository; +use App\Repositories\PirepRepository; +use App\Services\GeoService; +use App\Services\PIREPService; +use App\Services\UserService; +use Auth; +use Illuminate\Http\Request; +use Log; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; class PirepController extends RestController @@ -50,6 +44,7 @@ class PirepController extends RestController * @param GeoService $geoSvc * @param PirepRepository $pirepRepo * @param PIREPService $pirepSvc + * @param UserService $userSvc */ public function __construct( AcarsRepository $acarsRepo, @@ -435,7 +430,7 @@ class PirepController extends RestController /** * @param $id * @param Request $request - * @return AcarsRouteResource + * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection */ public function route_get($id, Request $request) { diff --git a/app/Http/Controllers/Api/RestController.php b/app/Http/Controllers/Api/RestController.php index 4bf41a1c..74617e34 100644 --- a/app/Http/Controllers/Api/RestController.php +++ b/app/Http/Controllers/Api/RestController.php @@ -1,10 +1,4 @@ settingRepo = $settingRepo; } /** * Return all the airlines, paginated + * @param Request $request + * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection */ public function index(Request $request) { diff --git a/app/Http/Controllers/Api/StatusController.php b/app/Http/Controllers/Api/StatusController.php index fae2f9cd..69d079ad 100644 --- a/app/Http/Controllers/Api/StatusController.php +++ b/app/Http/Controllers/Api/StatusController.php @@ -6,6 +6,9 @@ use PragmaRX\Version\Package\Facade as Version; class StatusController extends RestController { + /** + * @return \Illuminate\Http\JsonResponse + */ public function status() { return response()->json([ diff --git a/app/Http/Controllers/Api/UserController.php b/app/Http/Controllers/Api/UserController.php index 7de0a25d..9946486a 100644 --- a/app/Http/Controllers/Api/UserController.php +++ b/app/Http/Controllers/Api/UserController.php @@ -2,22 +2,19 @@ namespace App\Http\Controllers\Api; -use App\Models\Enums\PirepState; -use App\Repositories\Criteria\WhereCriteria; -use App\Repositories\PirepRepository; -use App\Repositories\SubfleetRepository; -use App\Services\UserService; -use Auth; -use Illuminate\Http\Request; - -use App\Repositories\UserRepository; - -use App\Models\UserBid; - use App\Http\Resources\Flight as FlightResource; use App\Http\Resources\Pirep as PirepResource; use App\Http\Resources\Subfleet as SubfleetResource; use App\Http\Resources\User as UserResource; +use App\Models\Enums\PirepState; +use App\Models\UserBid; +use App\Repositories\Criteria\WhereCriteria; +use App\Repositories\PirepRepository; +use App\Repositories\SubfleetRepository; +use App\Repositories\UserRepository; +use App\Services\UserService; +use Auth; +use Illuminate\Http\Request; use Prettus\Repository\Criteria\RequestCriteria; use Prettus\Repository\Exceptions\RepositoryException; @@ -29,6 +26,13 @@ class UserController extends RestController $userRepo, $userSvc; + /** + * UserController constructor. + * @param PirepRepository $pirepRepo + * @param SubfleetRepository $subfleetRepo + * @param UserRepository $userRepo + * @param UserService $userSvc + */ public function __construct( PirepRepository $pirepRepo, SubfleetRepository $subfleetRepo, @@ -56,6 +60,8 @@ class UserController extends RestController /** * Return the profile for the currently auth'd user + * @param Request $request + * @return UserResource */ public function index(Request $request) { @@ -64,6 +70,8 @@ class UserController extends RestController /** * Get the profile for the passed-in user + * @param $id + * @return UserResource */ public function get($id) { diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index d95f3b4b..8df86d0d 100755 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -9,11 +9,17 @@ class ForgotPasswordController extends Controller { use SendsPasswordResetEmails; + /** + * ForgotPasswordController constructor. + */ public function __construct() { $this->middleware('guest'); } + /** + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ public function showLinkRequestForm() { return $this->view('auth.passwords.email'); diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 4e45c170..dd54f842 100755 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -2,13 +2,12 @@ namespace App\Http\Controllers\Auth; -use Illuminate\Http\Request; -use Illuminate\Foundation\Auth\AuthenticatesUsers; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Log; - use App\Http\Controllers\Controller; use App\Models\Enums\UserState; +use Illuminate\Foundation\Auth\AuthenticatesUsers; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\Log; class LoginController extends Controller { @@ -16,11 +15,17 @@ class LoginController extends Controller protected $redirectTo = '/dashboard'; + /** + * LoginController constructor. + */ public function __construct() { $this->middleware('guest', ['except' => 'logout']); } + /** + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ public function showLoginForm() { return $this->view('auth/login'); diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 442cbbc7..b6bd853f 100755 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -2,22 +2,19 @@ namespace App\Http\Controllers\Auth; -use Log; -use Validator; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Hash; -use Illuminate\Foundation\Auth\RegistersUsers; -use Jackiedo\Timezonelist\Facades\Timezonelist; - -use App\Models\User; use App\Facades\Utils; -use App\Models\Airport; -use App\Models\Airline; -use App\Services\UserService; -use App\Models\Enums\UserState; use App\Http\Controllers\Controller; +use App\Models\Enums\UserState; +use App\Models\User; use App\Repositories\AirlineRepository; use App\Repositories\AirportRepository; +use App\Services\UserService; +use Illuminate\Foundation\Auth\RegistersUsers; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Hash; +use Jackiedo\Timezonelist\Facades\Timezonelist; +use Log; +use Validator; class RegisterController extends Controller { @@ -25,7 +22,6 @@ class RegisterController extends Controller /** * Where to redirect users after login / registration. - * * @var string */ protected $redirectTo = '/'; @@ -34,7 +30,12 @@ class RegisterController extends Controller $airportRepo, $userService; - + /** + * RegisterController constructor. + * @param AirlineRepository $airlineRepo + * @param AirportRepository $airportRepo + * @param UserService $userService + */ public function __construct( AirlineRepository $airlineRepo, AirportRepository $airportRepo, @@ -46,6 +47,9 @@ class RegisterController extends Controller $this->middleware('guest'); } + /** + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ public function showRegistrationForm() { $airports = $this->airportRepo->selectBoxList(false, true); @@ -60,7 +64,6 @@ class RegisterController extends Controller /** * Get a validator for an incoming registration request. - * * @param array $data * @return \Illuminate\Contracts\Validation\Validator */ @@ -77,7 +80,6 @@ class RegisterController extends Controller /** * Get a validator for an incoming registration request. - * * @param array $data * @return \Illuminate\Contracts\Validation\Validator * @throws \RuntimeException diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php index 95e61afa..2fc2837f 100755 --- a/app/Http/Controllers/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/Auth/ResetPasswordController.php @@ -2,9 +2,9 @@ namespace App\Http\Controllers\Auth; -use Illuminate\Http\Request; use App\Http\Controllers\Controller; use Illuminate\Foundation\Auth\ResetsPasswords; +use Illuminate\Http\Request; class ResetPasswordController extends Controller { @@ -12,6 +12,11 @@ class ResetPasswordController extends Controller use ResetsPasswords; + /** + * @param Request $request + * @param null $token + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ public function showResetForm(Request $request, $token = null) { return $this->view('auth.passwords.reset', @@ -21,7 +26,6 @@ class ResetPasswordController extends Controller /** * Create a new controller instance. - * * @return void */ public function __construct() diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 5929bc4b..aea044a4 100755 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -2,10 +2,10 @@ namespace App\Http\Controllers; -use Illuminate\Foundation\Bus\DispatchesJobs; -use Illuminate\Routing\Controller as BaseController; -use Illuminate\Foundation\Validation\ValidatesRequests; use Illuminate\Foundation\Auth\Access\AuthorizesRequests; +use Illuminate\Foundation\Bus\DispatchesJobs; +use Illuminate\Foundation\Validation\ValidatesRequests; +use Illuminate\Routing\Controller as BaseController; class Controller extends BaseController { diff --git a/app/Http/Controllers/Frontend/AcarsController.php b/app/Http/Controllers/Frontend/AcarsController.php index ff41659c..e6370c7d 100644 --- a/app/Http/Controllers/Frontend/AcarsController.php +++ b/app/Http/Controllers/Frontend/AcarsController.php @@ -2,16 +2,20 @@ namespace App\Http\Controllers\Frontend; +use App\Http\Controllers\Controller; use App\Repositories\AcarsRepository; use App\Services\GeoService; use Illuminate\Http\Request; -use App\Http\Controllers\Controller; - class AcarsController extends Controller { private $acarsRepo, $geoSvc; + /** + * AcarsController constructor. + * @param AcarsRepository $acarsRepo + * @param GeoService $geoSvc + */ public function __construct( AcarsRepository $acarsRepo, GeoService $geoSvc @@ -21,7 +25,8 @@ class AcarsController extends Controller } /** - * + * @param Request $request + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View */ public function index(Request $request) { diff --git a/app/Http/Controllers/Frontend/DashboardController.php b/app/Http/Controllers/Frontend/DashboardController.php index d586fd8d..f2b5636d 100644 --- a/app/Http/Controllers/Frontend/DashboardController.php +++ b/app/Http/Controllers/Frontend/DashboardController.php @@ -2,17 +2,20 @@ namespace App\Http\Controllers\Frontend; -use Log; -use Illuminate\Support\Facades\Auth; - use App\Http\Controllers\Controller; use App\Repositories\PirepRepository; use App\Repositories\UserRepository; +use Illuminate\Support\Facades\Auth; class DashboardController extends Controller { private $pirepRepo, $userRepo; + /** + * DashboardController constructor. + * @param PirepRepository $pirepRepo + * @param UserRepository $userRepo + */ public function __construct( PirepRepository $pirepRepo, UserRepository $userRepo diff --git a/app/Http/Controllers/Frontend/FlightController.php b/app/Http/Controllers/Frontend/FlightController.php index d740550b..1c9eb7e9 100644 --- a/app/Http/Controllers/Frontend/FlightController.php +++ b/app/Http/Controllers/Frontend/FlightController.php @@ -2,19 +2,16 @@ namespace App\Http\Controllers\Frontend; -use App\Repositories\AirlineRepository; -use App\Repositories\AirportRepository; -use App\Services\GeoService; -use Log; - -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Auth; - use App\Http\Controllers\Controller; use App\Models\UserBid; -use App\Repositories\FlightRepository; +use App\Repositories\AirlineRepository; +use App\Repositories\AirportRepository; use App\Repositories\Criteria\WhereCriteria; - +use App\Repositories\FlightRepository; +use App\Services\GeoService; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; +use Log; use Mockery\Exception; use Prettus\Repository\Exceptions\RepositoryException; @@ -25,6 +22,13 @@ class FlightController extends Controller $flightRepo, $geoSvc; + /** + * FlightController constructor. + * @param AirlineRepository $airlineRepo + * @param AirportRepository $airportRepo + * @param FlightRepository $flightRepo + * @param GeoService $geoSvc + */ public function __construct( AirlineRepository $airlineRepo, AirportRepository $airportRepo, @@ -37,6 +41,10 @@ class FlightController extends Controller $this->geoSvc = $geoSvc; } + /** + * @param Request $request + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ public function index(Request $request) { $where = ['active' => true]; @@ -86,6 +94,11 @@ class FlightController extends Controller ]); } + /** + * @param Request $request + * @return \Illuminate\Http\JsonResponse + * @throws \Exception + */ public function save(Request $request) { $user_id = Auth::id(); @@ -118,6 +131,8 @@ 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) { diff --git a/app/Http/Controllers/Frontend/HomeController.php b/app/Http/Controllers/Frontend/HomeController.php index 4e229a7a..2061bbb4 100644 --- a/app/Http/Controllers/Frontend/HomeController.php +++ b/app/Http/Controllers/Frontend/HomeController.php @@ -2,9 +2,9 @@ namespace App\Http\Controllers\Frontend; -use Illuminate\Database\QueryException; use App\Http\Controllers\Controller; use App\Models\User; +use Illuminate\Database\QueryException; class HomeController extends Controller { diff --git a/app/Http/Controllers/Frontend/PirepController.php b/app/Http/Controllers/Frontend/PirepController.php index e05d7ce9..18fd0713 100644 --- a/app/Http/Controllers/Frontend/PirepController.php +++ b/app/Http/Controllers/Frontend/PirepController.php @@ -2,28 +2,24 @@ namespace App\Http\Controllers\Frontend; -use Log; use App\Facades\Utils; +use App\Http\Controllers\Controller; use App\Http\Requests\CreatePirepRequest; -use Illuminate\Support\Facades\Auth; -use Illuminate\Http\Request; - use App\Models\Enums\PirepSource; use App\Models\Enums\PirepState; use App\Models\Pirep; -use App\Models\PirepField; - +use App\Repositories\AirlineRepository; +use App\Repositories\AirportRepository; +use App\Repositories\Criteria\WhereCriteria; +use App\Repositories\PirepFieldRepository; +use App\Repositories\PirepRepository; +use App\Repositories\SubfleetRepository; use App\Services\GeoService; use App\Services\PIREPService; use App\Services\UserService; - -use App\Repositories\Criteria\WhereCriteria; -use App\Http\Controllers\Controller; -use App\Repositories\AirlineRepository; -use App\Repositories\AirportRepository; -use App\Repositories\PirepRepository; -use App\Repositories\PirepFieldRepository; -use App\Repositories\SubfleetRepository; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; +use Log; class PirepController extends Controller @@ -37,6 +33,17 @@ class PirepController extends Controller $subfleetRepo, $userSvc; + /** + * PirepController constructor. + * @param AirlineRepository $airlineRepo + * @param PirepRepository $pirepRepo + * @param AirportRepository $airportRepo + * @param PirepFieldRepository $pirepFieldRepo + * @param GeoService $geoSvc + * @param SubfleetRepository $subfleetRepo + * @param PIREPService $pirepSvc + * @param UserService $userSvc + */ public function __construct( AirlineRepository $airlineRepo, PirepRepository $pirepRepo, @@ -119,9 +126,9 @@ class PirepController extends Controller } /** - * * @param CreatePirepRequest $request * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @throws \Exception */ public function store(CreatePirepRequest $request) { @@ -163,6 +170,10 @@ class PirepController extends Controller return redirect(route('frontend.pireps.show', ['id' => $pirep->id])); } + /** + * @param $id + * @return mixed + */ public function show($id) { $pirep = $this->pirepRepo->find($id); diff --git a/app/Http/Controllers/Frontend/ProfileController.php b/app/Http/Controllers/Frontend/ProfileController.php index 5a53405d..e08637a7 100644 --- a/app/Http/Controllers/Frontend/ProfileController.php +++ b/app/Http/Controllers/Frontend/ProfileController.php @@ -2,22 +2,20 @@ namespace App\Http\Controllers\Frontend; -use App\Support\Countries; -use Log; -use Hash; -use Flash; -use Validator; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Auth; -use Jackiedo\Timezonelist\Facades\Timezonelist; - -use App\Http\Controllers\Controller; - -use App\Models\User; use App\Facades\Utils; +use App\Http\Controllers\Controller; +use App\Models\User; use App\Repositories\AirlineRepository; use App\Repositories\AirportRepository; use App\Repositories\UserRepository; +use App\Support\Countries; +use Flash; +use Hash; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; +use Jackiedo\Timezonelist\Facades\Timezonelist; +use Log; +use Validator; class ProfileController extends Controller { @@ -25,6 +23,12 @@ class ProfileController extends Controller $airportRepo, $userRepo; + /** + * ProfileController constructor. + * @param AirlineRepository $airlineRepo + * @param AirportRepository $airportRepo + * @param UserRepository $userRepo + */ public function __construct( AirlineRepository $airlineRepo, AirportRepository $airportRepo, @@ -35,6 +39,9 @@ class ProfileController extends Controller $this->userRepo = $userRepo; } + /** + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ public function index() { $airports = $this->airportRepo->all(); @@ -45,6 +52,10 @@ class ProfileController extends Controller ]); } + /** + * @param $id + * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View + */ public function show($id) { $user = User::where('id', $id)->first(); @@ -63,6 +74,8 @@ 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) { @@ -84,6 +97,11 @@ class ProfileController extends Controller ]); } + /** + * @param Request $request + * @return $this + * @throws \Prettus\Validator\Exceptions\ValidatorException + */ public function update(Request $request) { $id = Auth::user()->id; @@ -120,6 +138,8 @@ 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) { diff --git a/app/Http/Controllers/Frontend/UserController.php b/app/Http/Controllers/Frontend/UserController.php index c7e1f45f..3232963d 100644 --- a/app/Http/Controllers/Frontend/UserController.php +++ b/app/Http/Controllers/Frontend/UserController.php @@ -2,15 +2,18 @@ namespace App\Http\Controllers\Frontend; +use App\Http\Controllers\Controller; use App\Repositories\UserRepository; use Illuminate\Http\Request; -use App\Http\Controllers\Controller; - class UserController extends Controller { private $userRepo; + /** + * UserController constructor. + * @param UserRepository $userRepo + */ public function __construct( UserRepository $userRepo ) { @@ -18,7 +21,8 @@ class UserController extends Controller } /** - * + * @param Request $request + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View */ public function index(Request $request) { diff --git a/app/Http/Middleware/ApiAuth.php b/app/Http/Middleware/ApiAuth.php index 64ad52d2..89500c1a 100644 --- a/app/Http/Middleware/ApiAuth.php +++ b/app/Http/Middleware/ApiAuth.php @@ -6,10 +6,9 @@ namespace App\Http\Middleware; use App\Models\Enums\UserState; -use Auth; -use Log; -use Closure; use App\Models\User; +use Auth; +use Closure; class ApiAuth { diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php index a2c35414..1ab3b7f6 100755 --- a/app/Http/Middleware/VerifyCsrfToken.php +++ b/app/Http/Middleware/VerifyCsrfToken.php @@ -8,10 +8,8 @@ class VerifyCsrfToken extends BaseVerifier { /** * The URIs that should be excluded from CSRF verification. - * * @var array */ protected $except = [ - // ]; } diff --git a/app/Http/Requests/Acars/EventRequest.php b/app/Http/Requests/Acars/EventRequest.php index 1c4a6dea..8f155945 100644 --- a/app/Http/Requests/Acars/EventRequest.php +++ b/app/Http/Requests/Acars/EventRequest.php @@ -2,8 +2,8 @@ namespace App\Http\Requests\Acars; -use Auth; use App\Models\Pirep; +use Auth; use Illuminate\Foundation\Http\FormRequest; /** diff --git a/app/Http/Requests/Acars/FileRequest.php b/app/Http/Requests/Acars/FileRequest.php index 440eda2b..a8a93dbf 100644 --- a/app/Http/Requests/Acars/FileRequest.php +++ b/app/Http/Requests/Acars/FileRequest.php @@ -2,8 +2,8 @@ namespace App\Http\Requests\Acars; -use Auth; use App\Models\Pirep; +use Auth; use Illuminate\Foundation\Http\FormRequest; /** diff --git a/app/Http/Requests/Acars/LogRequest.php b/app/Http/Requests/Acars/LogRequest.php index 431fc120..21da0861 100644 --- a/app/Http/Requests/Acars/LogRequest.php +++ b/app/Http/Requests/Acars/LogRequest.php @@ -2,8 +2,8 @@ namespace App\Http\Requests\Acars; -use Auth; use App\Models\Pirep; +use Auth; use Illuminate\Foundation\Http\FormRequest; /** diff --git a/app/Http/Requests/Acars/PositionRequest.php b/app/Http/Requests/Acars/PositionRequest.php index 26e90a82..65958d3c 100644 --- a/app/Http/Requests/Acars/PositionRequest.php +++ b/app/Http/Requests/Acars/PositionRequest.php @@ -2,8 +2,8 @@ namespace App\Http\Requests\Acars; -use Auth; use App\Models\Pirep; +use Auth; use Illuminate\Foundation\Http\FormRequest; /** diff --git a/app/Http/Requests/Acars/UpdateRequest.php b/app/Http/Requests/Acars/UpdateRequest.php index f874e901..29e67286 100644 --- a/app/Http/Requests/Acars/UpdateRequest.php +++ b/app/Http/Requests/Acars/UpdateRequest.php @@ -2,8 +2,8 @@ namespace App\Http\Requests\Acars; -use Auth; use App\Models\Pirep; +use Auth; use Illuminate\Foundation\Http\FormRequest; /** diff --git a/app/Http/Requests/CreateAircraftRequest.php b/app/Http/Requests/CreateAircraftRequest.php index 4501c0f5..4497a708 100644 --- a/app/Http/Requests/CreateAircraftRequest.php +++ b/app/Http/Requests/CreateAircraftRequest.php @@ -2,8 +2,8 @@ namespace App\Http\Requests; -use Illuminate\Foundation\Http\FormRequest; use App\Models\Aircraft; +use Illuminate\Foundation\Http\FormRequest; class CreateAircraftRequest extends FormRequest { diff --git a/app/Http/Requests/CreateAirlineRequest.php b/app/Http/Requests/CreateAirlineRequest.php index 36e029fb..86dcc188 100644 --- a/app/Http/Requests/CreateAirlineRequest.php +++ b/app/Http/Requests/CreateAirlineRequest.php @@ -2,8 +2,8 @@ namespace App\Http\Requests; -use Illuminate\Foundation\Http\FormRequest; use App\Models\Airline; +use Illuminate\Foundation\Http\FormRequest; class CreateAirlineRequest extends FormRequest { diff --git a/app/Http/Requests/CreateFareRequest.php b/app/Http/Requests/CreateFareRequest.php index 107c8cfb..a0402013 100644 --- a/app/Http/Requests/CreateFareRequest.php +++ b/app/Http/Requests/CreateFareRequest.php @@ -2,8 +2,8 @@ namespace App\Http\Requests; -use Illuminate\Foundation\Http\FormRequest; use App\Models\Fare; +use Illuminate\Foundation\Http\FormRequest; class CreateFareRequest extends FormRequest { diff --git a/app/Http/Requests/CreatePirepRequest.php b/app/Http/Requests/CreatePirepRequest.php index 0cb2abec..eb3b3424 100644 --- a/app/Http/Requests/CreatePirepRequest.php +++ b/app/Http/Requests/CreatePirepRequest.php @@ -2,11 +2,10 @@ namespace App\Http\Requests; -use Log; -use Illuminate\Foundation\Http\FormRequest; - use App\Models\Pirep; use App\Repositories\PirepFieldRepository; +use Illuminate\Foundation\Http\FormRequest; +use Log; class CreatePirepRequest extends FormRequest { diff --git a/app/Http/Requests/UpdateAirlineRequest.php b/app/Http/Requests/UpdateAirlineRequest.php index 03d464b6..e17f6306 100644 --- a/app/Http/Requests/UpdateAirlineRequest.php +++ b/app/Http/Requests/UpdateAirlineRequest.php @@ -2,8 +2,8 @@ namespace App\Http\Requests; -use Illuminate\Foundation\Http\FormRequest; use App\Models\Airline; +use Illuminate\Foundation\Http\FormRequest; class UpdateAirlineRequest extends FormRequest { diff --git a/app/Http/Requests/UpdateFareRequest.php b/app/Http/Requests/UpdateFareRequest.php index 27c64aba..dfc20c38 100644 --- a/app/Http/Requests/UpdateFareRequest.php +++ b/app/Http/Requests/UpdateFareRequest.php @@ -2,8 +2,8 @@ namespace App\Http\Requests; -use Illuminate\Foundation\Http\FormRequest; use App\Models\Fare; +use Illuminate\Foundation\Http\FormRequest; class UpdateFareRequest extends FormRequest { diff --git a/app/Http/Requests/UpdatePirepFieldRequest.php b/app/Http/Requests/UpdatePirepFieldRequest.php index 38d21c74..78f14eba 100644 --- a/app/Http/Requests/UpdatePirepFieldRequest.php +++ b/app/Http/Requests/UpdatePirepFieldRequest.php @@ -5,7 +5,6 @@ namespace App\Http\Requests; use App\Models\PirepField; use Illuminate\Foundation\Http\FormRequest; - class UpdatePirepFieldRequest extends FormRequest { diff --git a/app/Http/Requests/UpdatePirepRequest.php b/app/Http/Requests/UpdatePirepRequest.php index 4d161002..c0569d39 100644 --- a/app/Http/Requests/UpdatePirepRequest.php +++ b/app/Http/Requests/UpdatePirepRequest.php @@ -5,7 +5,6 @@ namespace App\Http\Requests; use App\Models\Pirep; use Illuminate\Foundation\Http\FormRequest; - class UpdatePirepRequest extends FormRequest { diff --git a/app/Listeners/NotificationEventListener.php b/app/Listeners/NotificationEventListener.php index 9330abf7..f1b6894b 100644 --- a/app/Listeners/NotificationEventListener.php +++ b/app/Listeners/NotificationEventListener.php @@ -2,12 +2,11 @@ namespace App\Listeners; -use Log; -use Illuminate\Support\Facades\Mail; - use App\Events\UserRegistered; use App\Events\UserStateChanged; use App\Models\Enums\UserState; +use Illuminate\Support\Facades\Mail; +use Log; /** * Handle sending emails on different events diff --git a/app/Mail/NewLoginDetails.php b/app/Mail/NewLoginDetails.php index 6ea2291a..c4a7ba72 100644 --- a/app/Mail/NewLoginDetails.php +++ b/app/Mail/NewLoginDetails.php @@ -3,8 +3,8 @@ namespace App\Mail; use App\Models\User; -use Illuminate\Mail\Mailable; use Illuminate\Bus\Queueable; +use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; class NewLoginDetails extends Mailable diff --git a/app/Mail/UserPending.php b/app/Mail/UserPending.php index 57565077..2d36c7d3 100644 --- a/app/Mail/UserPending.php +++ b/app/Mail/UserPending.php @@ -3,8 +3,8 @@ namespace App\Mail; use App\Models\User; -use Illuminate\Mail\Mailable; use Illuminate\Bus\Queueable; +use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; class UserPending extends Mailable diff --git a/app/Models/Enums/PirepSource.php b/app/Models/Enums/PirepSource.php index b8122324..c15a06d5 100644 --- a/app/Models/Enums/PirepSource.php +++ b/app/Models/Enums/PirepSource.php @@ -1,14 +1,7 @@