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

Add php-cs-fixer to build

Browse Source
This commit is contained in:
Nabeel Shahzad
2019-05-12 13:26:44 -05:00
parent 75eaec2f11
commit 88957f4071
25 changed files with 480 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Console/Commands/ImportCsv.php
View File

@@ -36,11 +36,11 @@ class ImportCsv extends Command
$type = $this->argument('type');
$file = $this->argument('file');
if (\in_array($type, ['flight', 'flights'])) {
if (\in_array($type, ['flight', 'flights'], true)) {
$status = $this->importer->importFlights($file);
} elseif ($type === 'aircraft') {
$status = $this->importer->importAircraft($file);
} elseif (\in_array($type, ['airport', 'airports'])) {
} elseif (\in_array($type, ['airport', 'airports'], true)) {
$status = $this->importer->importAirports($file);
} elseif ($type === 'subfleet') {
$status = $this->importer->importSubfleets($file);

4
app/Exceptions/BidExists.php
View File

@@ -18,7 +18,9 @@ class BidExists extends HttpException
parent::__construct(
409,
'A bid already exists for this flight',
$previous, $headers, $code
$previous,
$headers,
$code
);
}
}

3
app/Exceptions/InternalError.php
View File

@@ -28,7 +28,8 @@ class InternalError extends ValidationException
$validator = Validator::make([], []);
$validator->errors()->add(
$field ?? static::FIELD,
$message ?? static::MESSAGE);
$message ?? static::MESSAGE
);
parent::__construct($validator);
}

4
app/Exceptions/PirepCancelled.php
View File

@@ -18,7 +18,9 @@ class PirepCancelled extends HttpException
parent::__construct(
400,
'PIREP has been cancelled, updates are not allowed',
$previous, $headers, $code
$previous,
$headers,
$code
);
}
}

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

@@ -232,7 +232,9 @@ class AircraftController extends Controller
if ($request->isMethod('post')) {
ImportRequest::validate($request);
$path = Storage::putFileAs(
'import', $request->file('csv_file'), 'import_aircraft.csv'
'import',
$request->file('csv_file'),
'import_aircraft.csv'
);
$path = storage_path('app/'.$path);

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

@@ -229,7 +229,9 @@ class AirportController extends Controller
if ($request->isMethod('post')) {
ImportRequest::validate($request);
$path = Storage::putFileAs(
'import', $request->file('csv_file'), 'import_airports.csv'
'import',
$request->file('csv_file'),
'import_airports.csv'
);
$path = storage_path('app/'.$path);

4
app/Http/Controllers/Admin/ExpenseController.php
View File

@@ -229,7 +229,9 @@ class ExpenseController extends Controller
if ($request->isMethod('post')) {
ImportRequest::validate($request);
$path = Storage::putFileAs(
'import', $request->file('csv_file'), 'import_expenses.csv'
'import',
$request->file('csv_file'),
'import_expenses.csv'
);
$path = storage_path('app/'.$path);

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

@@ -204,7 +204,9 @@ class FareController extends Controller
if ($request->isMethod('post')) {
ImportRequest::validate($request);
$path = Storage::putFileAs(
'import', $request->file('csv_file'), 'import_fares.csv'
'import',
$request->file('csv_file'),
'import_fares.csv'
);
$path = storage_path('app/'.$path);

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

@@ -285,7 +285,8 @@ class FlightController extends Controller
$input['flight_time'] = Time::init(
$input['minutes'],
$input['hours'])->getMinutes();
$input['hours']
)->getMinutes();
$input['active'] = get_truth_state($input['active']);
@@ -355,7 +356,9 @@ class FlightController extends Controller
if ($request->isMethod('post')) {
$path = Storage::putFileAs(
'import', $request->file('csv_file'), 'import_flights.csv'
'import',
$request->file('csv_file'),
'import_flights.csv'
);
$path = storage_path('app/'.$path);

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

@@ -365,7 +365,8 @@ class PirepController extends Controller
// Fix the time
$attrs['flight_time'] = Time::init(
$attrs['minutes'],
$attrs['hours'])->getMinutes();
$attrs['hours']
)->getMinutes();
$pirep = $this->pirepRepo->update($attrs, $id);

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

@@ -304,7 +304,9 @@ class SubfleetController extends Controller
ImportRequest::validate($request);
$path = Storage::putFileAs(
'import', $request->file('csv_file'), 'import_subfleets.csv'
'import',
$request->file('csv_file'),
'import_subfleets.csv'
);
$path = storage_path('app/'.$path);

3
app/Http/Controllers/Auth/ResetPasswordController.php
View File

@@ -23,7 +23,8 @@ class ResetPasswordController extends Controller
*/
public function showResetForm(Request $request, $token = null)
{
return view('auth.passwords.reset',
return view(
'auth.passwords.reset',
['token' => $token, 'email' => $request->email]
);
}

3
app/Http/Controllers/Frontend/PirepController.php
View File

@@ -406,7 +406,8 @@ class PirepController extends Controller
// Fix the time
$attrs['flight_time'] = Time::init(
$attrs['minutes'],
$attrs['hours'])->getMinutes();
$attrs['hours']
)->getMinutes();
$pirep = $this->pirepRepo->update($attrs, $id);

6
app/Listeners/NotificationEvents.php
View File

@@ -108,8 +108,10 @@ class NotificationEvents extends Listener
if ($event->old_state === UserState::PENDING) {
if ($event->user->state === UserState::ACTIVE) {
$email = new \App\Mail\UserRegistered($event->user,
'Your registration has been accepted!');
$email = new \App\Mail\UserRegistered(
$event->user,
'Your registration has been accepted!'
);
} elseif ($event->user->state === UserState::REJECTED) {
$email = new \App\Mail\UserRejected($event->user);
}

3
app/Models/Acars.php
View File

@@ -114,7 +114,8 @@ class Acars extends Model
{
if ($value instanceof Distance) {
$this->attributes['distance'] = $value->toUnit(
config('phpvms.internal_units.distance'));
config('phpvms.internal_units.distance')
);
} else {
$this->attributes['distance'] = $value;
}

14
app/Routes/admin.php
View File

@@ -76,15 +76,19 @@ Route::group([
Route::resource('subfleets', 'SubfleetController');
Route::resource('users', 'UserController');
Route::get('users/{id}/regen_apikey',
'UserController@regen_apikey')->name('users.regen_apikey');
Route::get(
'users/{id}/regen_apikey',
'UserController@regen_apikey'
)->name('users.regen_apikey');
// defaults
Route::get('', ['uses' => 'DashboardController@index']);
Route::get('/', ['uses' => 'DashboardController@index']);
Route::get('dashboard', ['uses' => 'DashboardController@index', 'name' => 'dashboard']);
Route::match(['get', 'post', 'delete'],
'dashboard/news', ['uses' => 'DashboardController@news'])
->name('dashboard.news');
Route::match(
['get', 'post', 'delete'],
'dashboard/news',
['uses' => 'DashboardController@news']
)->name('dashboard.news');
});

1
app/Support/Metar.php
View File

@@ -625,7 +625,6 @@ class Metar implements \ArrayAccess
$minute = (int) $found[3];
if ($this->result['observed_date'] === null) {
// Take one month, if the observed day is greater than the current day
if ($day > date('j')) {
$month = date('n') - 1;