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

Laravel 9 Update (#1413)

Browse Source 
Update to Laravel 9 and PHP 8+

Co-authored-by: B.Fatih KOZ <fatih.koz@gmail.com>
This commit is contained in:
Nabeel S
2022-03-14 11:45:18 -04:00
committed by GitHub
parent 00bf18c225
commit 12848091a2
340 changed files with 6130 additions and 4502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/TestData.php
View File

@@ -26,7 +26,7 @@ trait TestData
$subfleet = $this->createSubfleetWithAircraft(1);
$rank = $this->createRank(2, [$subfleet['subfleet']->id]);
return factory(User::class)->create(array_merge([
return User::factory()->create(array_merge([
'flight_time' => 1000,
'rank_id' => $rank->id,
'state' => UserState::ACTIVE,
@@ -43,7 +43,7 @@ trait TestData
public function createAdminUser(array $attrs = []): User
{
/** @var User $admin */
$admin = factory(User::class)->create($attrs);
$admin = User::factory()->create($attrs);
/** @var UserService $userSvc */
$userSvc = app(UserService::class);
@@ -69,12 +69,12 @@ trait TestData
$rank = $this->createRank(10, [$subfleet['subfleet']->id]);
/** @var User user */
$this->user = factory(User::class)->create(array_merge([
$this->user = User::factory()->create(array_merge([
'rank_id' => $rank->id,
], $user_attrs));
// Return a Pirep model
return factory(Pirep::class)->make(array_merge([
return Pirep::factory()->make(array_merge([
'user_id' => $this->user->id,
'aircraft_id' => $subfleet['aircraft']->random()->id,
], $pirep_attrs));
@@ -96,7 +96,7 @@ trait TestData
$attrs['hours'] = $hours;
}
$rank = factory(\App\Models\Rank::class)->create($attrs);
$rank = \App\Models\Rank::factory()->create($attrs);
if (!empty($subfleet_ids)) {
$rank->subfleets()->syncWithoutDetaching($subfleet_ids);
}
@@ -118,10 +118,10 @@ trait TestData
'airline_id' => $user->airline_id,
], $flight_properties);
$flight = factory(Flight::class)->create($opts);
$flight = Flight::factory()->create($opts);
$flight->subfleets()->syncWithoutDetaching([
factory(Subfleet::class)->create([
Subfleet::factory()->create([
'airline_id' => $user->airline_id,
])->id,
]);
@@ -139,7 +139,7 @@ trait TestData
*/
public function addFlightsForSubfleet($subfleet, $num_flights)
{
return factory(Flight::class, $num_flights)->create([
return Flight::factory()->count($num_flights)->create([
'airline_id' => $subfleet->airline->id,
])->each(function (Flight $f) use ($subfleet) {
$f->subfleets()->syncWithoutDetaching([$subfleet->id]);
@@ -160,7 +160,7 @@ trait TestData
public function createSubfleetWithAircraft($aircraft_count = null, $airport_id = null)
{
/** @var Subfleet $subfleet */
$subfleet = factory(Subfleet::class)->create([
$subfleet = Subfleet::factory()->create([
'ground_handling_multiplier' => '100',
]);
@@ -168,7 +168,7 @@ trait TestData
$aircraft_count = \random_int(2, 10);
}
$aircraft = factory(Aircraft::class, $aircraft_count)->create([
$aircraft = Aircraft::factory()->count($aircraft_count)->create([
'subfleet_id' => $subfleet->id,
'airport_id' => $airport_id,
]);
@@ -188,6 +188,6 @@ trait TestData
*/
public function createRole(array $attrs = []): Role
{
return factory(Role::class)->create($attrs);
return Role::factory()->create($attrs);
}
}