Laravel 9 Update (#1413)

Update to Laravel 9 and PHP 8+

Co-authored-by: B.Fatih KOZ <fatih.koz@gmail.com>

app/Services/ImportExport/AircraftExporter.php

@@ -31,12 +31,13 @@ class AircraftExporter extends ImportExport
     {
         $ret = [];
         foreach (self::$columns as $column) {
-            $ret[$column] = $aircraft->{$column};
+            if ($column === 'subfleet') {
+                $ret['subfleet'] = $aircraft->subfleet->type;
+            } else {
+                $ret[$column] = $aircraft->{$column};
+            }
         }
 
-        // Modify special fields
-        $ret['subfleet'] = $aircraft->subfleet->type;
-
         return $ret;
     }
 }

app/Services/ImportExport/ExpenseExporter.php

@@ -35,17 +35,13 @@ class ExpenseExporter extends ImportExport
         $ret = [];
 
         foreach (self::$columns as $col) {
-            $ret[$col] = $expense->{$col};
-        }
-
-        // Special fields
-
-        if ($ret['airline']) {
-            $ret['airline'] = $expense->airline->icao;
-        }
-
-        if ($ret['flight_type']) {
-            $ret['flight_type'] = $ret['flight_type'][0];
+            if ($col === 'airline') {
+                $ret['airline'] = optional($expense->airline)->icao;
+            } elseif ($col === 'flight_type') {
+                $ret['flight_type'] = implode(',', $expense->flight_type);
+            } else {
+                $ret[$col] = $expense->{$col};
+            }
         }
 
         // For the different expense types, instead of exporting

app/Services/ImportExport/FlightExporter.php

@@ -36,7 +36,7 @@ class FlightExporter extends ImportExport
         }
 
         // Modify special fields
-        $ret['airline'] = $ret['airline']->icao;
+        $ret['airline'] = $flight->airline->icao;
         $ret['dpt_airport'] = $flight->dpt_airport_id;
         $ret['arr_airport'] = $flight->arr_airport_id;