FGFS-4.1/phpvms
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed formatting of almost every file

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-02-20 22:33:09 -06:00
parent c5b6ca53fa
commit ea09a18956
138 changed files with 600 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Admin/AircraftController.php
View File

@@ -2,12 +2,12 @@
namespace App\Http\Controllers\Admin;
use App\Models\Subfleet;
use App\Http\Requests\CreateAircraftRequest;
use App\Http\Requests\UpdateAircraftRequest;
use App\Models\Subfleet;
use App\Repositories\AircraftRepository;
use Illuminate\Http\Request;
use Flash;
use Illuminate\Http\Request;
use Prettus\Repository\Criteria\RequestCriteria;
@@ -15,6 +15,10 @@ class AircraftController extends BaseController
{
private $aircraftRepository;
/**
* AircraftController constructor.
* @param AircraftRepository $aircraftRepo
*/
public function __construct(
AircraftRepository $aircraftRepo
) {

22
app/Http/Controllers/Admin/AirlinesController.php
View File

@@ -2,23 +2,27 @@
namespace App\Http\Controllers\Admin;
use App\Support\Countries;
use Flash;
use Response;
use Illuminate\Http\Request;
use Prettus\Repository\Criteria\RequestCriteria;
use App\Http\Requests\CreateAirlineRequest;
use App\Http\Requests\UpdateAirlineRequest;
use App\Repositories\AirlineRepository;
use App\Support\Countries;
use Flash;
use Illuminate\Http\Request;
use Prettus\Repository\Criteria\RequestCriteria;
use Response;
class AirlinesController extends BaseController
{
/** @var AirlineRepository */
private $airlineRepo;
public function __construct(AirlineRepository $airlinesRepo)
{
/**
* AirlinesController constructor.
* @param AirlineRepository $airlinesRepo
*/
public function __construct(
AirlineRepository $airlinesRepo
) {
$this->airlineRepo = $airlinesRepo;
}
@@ -59,9 +63,7 @@ class AirlinesController extends BaseController
/**
* Display the specified Airlines.
*
* @param int $id
*
* @return mixed
*/
public function show($id)

19
app/Http/Controllers/Admin/AirportController.php
View File

@@ -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;

18
app/Http/Controllers/Admin/DashboardController.php
View File

@@ -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,

28
app/Http/Controllers/Admin/FareController.php
View File

@@ -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)

34
app/Http/Controllers/Admin/FlightController.php
View File

@@ -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)
{

42
app/Http/Controllers/Admin/PirepController.php
View File

@@ -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)
{

21
app/Http/Controllers/Admin/PirepFieldController.php
View File

@@ -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'));
}
}

47
app/Http/Controllers/Admin/RankController.php
View File

@@ -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!');

8
app/Http/Controllers/Admin/SettingsController.php
View File

@@ -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');
}
}

23
app/Http/Controllers/Admin/SubfleetController.php
View File

@@ -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()

49
app/Http/Controllers/Admin/UserController.php
View File

@@ -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)
{