FGFS-4.1/phpvms
3
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

7
app/Http/Resources/Acars.php
View File

@@ -16,9 +16,6 @@ class Acars extends Resource
*
* @param \Illuminate\Http\Request $request
*
* @throws \PhpUnitsOfMeasure\Exception\NonNumericValue
* @throws \PhpUnitsOfMeasure\Exception\NonStringUnitName
*
* @return array
*/
public function toArray($request)
@@ -27,11 +24,11 @@ class Acars extends Resource
// Set these to the response units
$distance = !empty($res['distance']) ? $res['distance'] : 0;
$distance = new Distance($distance, config('phpvms.internal_units.distance'));
$distance = Distance::make($distance, config('phpvms.internal_units.distance'));
$res['distance'] = $distance->getResponseUnits();
$fuel = !empty($res['fuel']) ? $res['fuel'] : 0;
$fuel = new Fuel($fuel, config('phpvms.internal_units.fuel'));
$fuel = Fuel::make($fuel, config('phpvms.internal_units.fuel'));
$res['fuel'] = $fuel->getResponseUnits();
$res['pirep'] = Pirep::make($this->whenLoaded('pirep'));

3
app/Http/Resources/Airline.php
View File

@@ -4,6 +4,9 @@ namespace App\Http\Resources;
use App\Contracts\Resource;
/**
* @mixin \App\Models\Airline
*/
class Airline extends Resource
{
public function toArray($request)

3
app/Http/Resources/Award.php
View File

@@ -4,6 +4,9 @@ namespace App\Http\Resources;
use App\Contracts\Resource;
/**
* @mixin \App\Models\Award
*/
class Award extends Resource
{
public function toArray($request)

3
app/Http/Resources/BidSubfleet.php
View File

@@ -2,6 +2,9 @@
namespace App\Http\Resources;
/**
* @mixin \App\Models\Subfleet
*/
class BidSubfleet extends Subfleet
{
protected $aircraft;

2
app/Http/Resources/Flight.php
View File

@@ -53,7 +53,7 @@ class Flight extends Resource
$res['load_factor_variance'] = setting('flights.load_factor_variance');
}
$distance = new Distance($res['distance'], config('phpvms.internal_units.distance'));
$distance = Distance::make($res['distance'], config('phpvms.internal_units.distance'));
$res['distance'] = $distance->getResponseUnits();
$res['airline'] = new Airline($this->airline);

3
app/Http/Resources/News.php
View File

@@ -4,6 +4,9 @@ namespace App\Http\Resources;
use App\Contracts\Resource;
/**
* @mixin \App\Models\News
*/
class News extends Resource
{
/**

11
app/Http/Resources/Pirep.php
View File

@@ -18,9 +18,6 @@ class Pirep extends Resource
*
* @param \Illuminate\Http\Request $request
*
* @throws \PhpUnitsOfMeasure\Exception\NonNumericValue
* @throws \PhpUnitsOfMeasure\Exception\NonStringUnitName
*
* @return array
*/
public function toArray($request)
@@ -35,28 +32,28 @@ class Pirep extends Resource
$res['distance'] = 0;
}
$distance = new Distance($res['distance'], config('phpvms.internal_units.distance'));
$distance = Distance::make($res['distance'], config('phpvms.internal_units.distance'));
$res['distance'] = $distance->getResponseUnits();
if (!array_key_exists('block_fuel', $res)) {
$res['block_fuel'] = 0;
}
$block_fuel = new Fuel($res['block_fuel'], config('phpvms.internal_units.fuel'));
$block_fuel = Fuel::make($res['block_fuel'], config('phpvms.internal_units.fuel'));
$res['block_fuel'] = $block_fuel->getResponseUnits();
if (!array_key_exists('fuel_used', $res)) {
$res['fuel_used'] = 0;
}
$fuel_used = new Fuel($res['fuel_used'], config('phpvms.internal_units.fuel'));
$fuel_used = Fuel::make($res['fuel_used'], config('phpvms.internal_units.fuel'));
$res['fuel_used'] = $fuel_used->getResponseUnits();
if (!array_key_exists('planned_distance', $res)) {
$res['planned_distance'] = 0;
}
$planned_dist = new Distance($res['planned_distance'], config('phpvms.internal_units.distance'));
$planned_dist = Distance::make($res['planned_distance'], config('phpvms.internal_units.distance'));
$res['planned_distance'] = $planned_dist->getResponseUnits();
/*

3
app/Http/Resources/Setting.php
View File

@@ -4,6 +4,9 @@ namespace App\Http\Resources;
use App\Contracts\Resource;
/**
* @mixin \App\Models\Setting
*/
class Setting extends Resource
{
public function toArray($request)