Laravel 9 Update (#1413)

Update to Laravel 9 and PHP 8+

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

app/Http/Controllers/Admin/AircraftController.php

@@ -22,9 +22,9 @@ class AircraftController extends Controller
 {
     use Importable;
 
-    private $aircraftRepo;
-    private $airportRepo;
-    private $importSvc;
+    private AircraftRepository $aircraftRepo;
+    private AirportRepository $airportRepo;
+    private ImportService $importSvc;
 
     /**
      * AircraftController constructor.

app/Http/Controllers/Admin/AirlinesController.php

@@ -15,8 +15,8 @@ use Prettus\Repository\Criteria\RequestCriteria;
 
 class AirlinesController extends Controller
 {
-    private $airlineRepo;
-    private $airlineSvc;
+    private AirlineRepository $airlineRepo;
+    private AirlineService $airlineSvc;
 
     /**
      * AirlinesController constructor.

app/Http/Controllers/Admin/AirportController.php

@@ -21,8 +21,8 @@ class AirportController extends Controller
 {
     use Importable;
 
-    private $airportRepo;
-    private $importSvc;
+    private AirportRepository $airportRepo;
+    private ImportService $importSvc;
 
     /**
      * @param AirportRepository $airportRepo

app/Http/Controllers/Admin/AwardController.php

@@ -14,8 +14,8 @@ use Prettus\Repository\Criteria\RequestCriteria;
 class AwardController extends Controller
 {
     /** @var AwardRepository */
-    private $awardRepository;
-    private $awardSvc;
+    private AwardRepository $awardRepository;
+    private AwardService $awardSvc;
 
     /**
      * AwardController constructor.

app/Http/Controllers/Admin/DashboardController.php

@@ -16,12 +16,12 @@ use Laracasts\Flash\Flash;
 
 class DashboardController extends Controller
 {
-    private $cronSvc;
-    private $kvpRepo;
-    private $newsRepo;
-    private $newsSvc;
-    private $pirepRepo;
-    private $userRepo;
+    private CronService $cronSvc;
+    private KvpRepository $kvpRepo;
+    private NewsRepository $newsRepo;
+    private NewsService $newsSvc;
+    private PirepRepository $pirepRepo;
+    private UserRepository $userRepo;
 
     /**
      * DashboardController constructor.

app/Http/Controllers/Admin/ExpenseController.php

@@ -20,9 +20,9 @@ class ExpenseController extends Controller
 {
     use Importable;
 
-    private $airlineRepo;
-    private $expenseRepo;
-    private $importSvc;
+    private AirlineRepository $airlineRepo;
+    private ExpenseRepository $expenseRepo;
+    private ImportService $importSvc;
 
     /**
      * expensesController constructor.

app/Http/Controllers/Admin/FareController.php

@@ -20,8 +20,8 @@ class FareController extends Controller
 {
     use Importable;
 
-    private $fareRepo;
-    private $importSvc;
+    private FareRepository $fareRepo;
+    private ImportService $importSvc;
 
     /**
      * FareController constructor.

app/Http/Controllers/Admin/FileController.php

@@ -12,7 +12,7 @@ use Laracasts\Flash\Flash;
 
 class FileController extends Controller
 {
-    private $fileSvc;
+    private FileService $fileSvc;
 
     public function __construct(FileService $fileSvc)
     {

app/Http/Controllers/Admin/FinanceController.php

@@ -12,8 +12,8 @@ use Illuminate\Http\Request;
 
 class FinanceController extends Controller
 {
-    private $airlineRepo;
-    private $financeSvc;
+    private AirlineRepository $airlineRepo;
+    private FinanceService $financeSvc;
 
     /**
      * @param AirlineRepository $airlineRepo

app/Http/Controllers/Admin/FlightController.php

@@ -31,15 +31,15 @@ class FlightController extends Controller
 {
     use Importable;
 
-    private $airlineRepo;
-    private $airportRepo;
-    private $fareRepo;
-    private $flightRepo;
-    private $flightFieldRepo;
-    private $fareSvc;
-    private $flightSvc;
-    private $importSvc;
-    private $subfleetRepo;
+    private AirlineRepository $airlineRepo;
+    private AirportRepository $airportRepo;
+    private FareRepository $fareRepo;
+    private FlightRepository $flightRepo;
+    private FlightFieldRepository $flightFieldRepo;
+    private FareService $fareSvc;
+    private FlightService $flightSvc;
+    private ImportService $importSvc;
+    private SubfleetRepository $subfleetRepo;
 
     /**
      * FlightController constructor.

app/Http/Controllers/Admin/FlightFieldController.php

@@ -10,7 +10,7 @@ use Prettus\Repository\Criteria\RequestCriteria;
 
 class FlightFieldController extends Controller
 {
-    private $flightFieldRepo;
+    private FlightFieldRepository $flightFieldRepo;
 
     /**
      * FlightFieldController constructor.

app/Http/Controllers/Admin/MaintenanceController.php

@@ -14,9 +14,9 @@ use Laracasts\Flash\Flash;
 
 class MaintenanceController extends Controller
 {
-    private $cronSvc;
-    private $kvpRepo;
-    private $versionSvc;
+    private CronService $cronSvc;
+    private KvpRepository $kvpRepo;
+    private VersionService $versionSvc;
 
     public function __construct(
         CronService $cronSvc,

app/Http/Controllers/Admin/ModulesController.php

@@ -14,7 +14,7 @@ use Illuminate\View\View;
 
 class ModulesController extends Controller
 {
-    private $moduleSvc;
+    private ModuleService $moduleSvc;
 
     public function __construct(ModuleService $moduleSvc)
     {

app/Http/Controllers/Admin/PagesController.php

@@ -11,7 +11,7 @@ use Laracasts\Flash\Flash;
 
 class PagesController extends Controller
 {
-    private $pageRepo;
+    private PageRepository $pageRepo;
 
     /**
      * @param PageRepository $pageRepo

app/Http/Controllers/Admin/PirepController.php

@@ -29,16 +29,16 @@ use Prettus\Repository\Criteria\RequestCriteria;
 
 class PirepController extends Controller
 {
-    private $airportRepo;
-    private $airlineRepo;
-    private $aircraftRepo;
-    private $fareSvc;
-    private $journalRepo;
-    private $pirepSvc;
-    private $pirepRepo;
-    private $pirepFieldRepo;
-    private $subfleetRepo;
-    private $userSvc;
+    private AirportRepository $airportRepo;
+    private AirlineRepository $airlineRepo;
+    private AircraftRepository $aircraftRepo;
+    private FareService $fareSvc;
+    private JournalRepository $journalRepo;
+    private PirepService $pirepSvc;
+    private PirepRepository $pirepRepo;
+    private PirepFieldRepository $pirepFieldRepo;
+    private SubfleetRepository $subfleetRepo;
+    private UserService $userSvc;
 
     /**
      * PirepController constructor.

app/Http/Controllers/Admin/PirepFieldController.php

@@ -12,7 +12,7 @@ use Prettus\Repository\Criteria\RequestCriteria;
 
 class PirepFieldController extends Controller
 {
-    private $pirepFieldRepo;
+    private PirepFieldRepository $pirepFieldRepo;
 
     /**
      * PirepFieldController constructor.

app/Http/Controllers/Admin/RankController.php

@@ -15,9 +15,9 @@ use Prettus\Repository\Criteria\RequestCriteria;
 
 class RankController extends Controller
 {
-    private $fleetSvc;
-    private $rankRepository;
-    private $subfleetRepo;
+    private FleetService $fleetSvc;
+    private RankRepository $rankRepository;
+    private SubfleetRepository $subfleetRepo;
 
     /**
      * RankController constructor.

app/Http/Controllers/Admin/RolesController.php

@@ -15,9 +15,9 @@ use Prettus\Repository\Criteria\RequestCriteria;
 
 class RolesController extends Controller
 {
-    private $permsRepo;
-    private $rolesRepo;
-    private $roleSvc;
+    private PermissionsRepository $permsRepo;
+    private RoleRepository $rolesRepo;
+    private RoleService $roleSvc;
 
     /**
      * AirlinesController constructor.

app/Http/Controllers/Admin/SettingsController.php

@@ -11,7 +11,7 @@ use Illuminate\Support\Facades\Log;
 
 class SettingsController extends Controller
 {
-    private $financeSvc;
+    private FinanceService $financeSvc;
 
     /**
      * @param FinanceService $financeSvc

app/Http/Controllers/Admin/SubfleetController.php

@@ -30,14 +30,14 @@ class SubfleetController extends Controller
 {
     use Importable;
 
-    private $aircraftRepo;
-    private $fareRepo;
-    private $fareSvc;
-    private $fleetSvc;
-    private $importSvc;
-    private $rankRepo;
-    private $subfleetRepo;
-    private $typeratingRepo;
+    private AircraftRepository $aircraftRepo;
+    private FareRepository $fareRepo;
+    private FareService $fareSvc;
+    private FleetService $fleetSvc;
+    private ImportService $importSvc;
+    private RankRepository $rankRepo;
+    private SubfleetRepository $subfleetRepo;
+    private TypeRatingRepository $typeratingRepo;
 
     /**
      * SubfleetController constructor.

app/Http/Controllers/Admin/TypeRatingController.php

@@ -15,9 +15,9 @@ use Prettus\Repository\Criteria\RequestCriteria;
 
 class TypeRatingController extends Controller
 {
-    private $fleetSvc;
-    private $subfleetRepo;
-    private $typeratingRepo;
+    private FleetService $fleetSvc;
+    private SubfleetRepository $subfleetRepo;
+    private TypeRatingRepository $typeratingRepo;
 
     public function __construct(
         FleetService $fleetSvc,

app/Http/Controllers/Admin/UserController.php

@@ -27,13 +27,13 @@ use Prettus\Repository\Exceptions\RepositoryException;
 
 class UserController extends Controller
 {
-    private $airlineRepo;
-    private $airportRepo;
-    private $pirepRepo;
-    private $roleRepo;
-    private $typeratingRepo;
-    private $userRepo;
-    private $userSvc;
+    private AirlineRepository $airlineRepo;
+    private AirportRepository $airportRepo;
+    private PirepRepository $pirepRepo;
+    private RoleRepository $roleRepo;
+    private TypeRatingRepository $typeratingRepo;
+    private UserRepository $userRepo;
+    private UserService $userSvc;
 
     /**
      * UserController constructor.

app/Http/Controllers/Admin/UserFieldController.php

@@ -11,7 +11,7 @@ use Prettus\Repository\Criteria\RequestCriteria;
 class UserFieldController extends Controller
 {
     /** @var \App\Repositories\UserFieldRepository */
-    private $userFieldRepo;
+    private UserFieldRepository $userFieldRepo;
 
     /**
      * @param UserFieldRepository $userFieldRepo