From a720f12e0b91b59f5dd3dbf16a9ad55dfe39b435 Mon Sep 17 00:00:00 2001 From: Nabeel Shahzad Date: Mon, 15 Jul 2019 15:44:31 -0400 Subject: [PATCH] Rename Interfaces to Contracts to better match Laravel conventions --- app/Awards/PilotFlightAwards.php | 2 +- app/{Interfaces => Contracts}/Award.php | 2 +- app/{Interfaces => Contracts}/Controller.php | 2 +- app/{Interfaces => Contracts}/Enum.php | 2 +- app/{Interfaces => Contracts}/FormRequest.php | 2 +- app/{Interfaces => Contracts}/ImportExport.php | 2 +- app/{Interfaces => Contracts}/Listener.php | 2 +- app/{Interfaces => Contracts}/Metar.php | 2 +- app/{Interfaces => Contracts}/Migration.php | 2 +- app/{Interfaces => Contracts}/Model.php | 2 +- app/{Interfaces => Contracts}/Repository.php | 2 +- app/{Interfaces => Contracts}/Service.php | 2 +- app/{Interfaces => Contracts}/Unit.php | 2 +- app/{Interfaces => Contracts}/Widget.php | 2 +- app/Cron/Hourly/RemoveExpiredBids.php | 2 +- app/Cron/Hourly/RemoveExpiredLiveFlights.php | 2 +- app/Cron/Monthly/ApplyExpenses.php | 2 +- app/Cron/Nightly/ApplyExpenses.php | 2 +- app/Cron/Nightly/PilotLeave.php | 2 +- app/Cron/Nightly/RecalculateBalances.php | 2 +- app/Cron/Nightly/RecalculateStats.php | 2 +- app/Cron/Nightly/SetActiveFlights.php | 2 +- .../2017_06_07_014930_create_settings_table.php | 2 +- .../migrations/2017_06_08_0000_create_users_table.php | 2 +- .../2017_06_08_0001_roles_permissions_tables.php | 2 +- .../2017_06_08_0005_create_password_resets_table.php | 2 +- .../2017_06_08_0006_create_sessions_table.php | 2 +- .../2017_06_08_191703_create_airlines_table.php | 2 +- .../2017_06_09_010621_create_aircrafts_table.php | 2 +- .../2017_06_10_040335_create_fares_table.php | 2 +- .../2017_06_11_135707_create_airports_table.php | 2 +- .../2017_06_17_214650_create_flight_tables.php | 10 +++++----- .../2017_06_21_165410_create_ranks_table.php | 2 +- .../2017_06_23_011011_create_subfleet_tables.php | 2 +- .../2017_06_28_195426_create_pirep_tables.php | 10 +++++----- .../migrations/2017_12_12_174519_create_bids_table.php | 4 ++-- .../migrations/2017_12_14_225241_create_jobs_table.php | 2 +- .../2017_12_14_225337_create_failed_jobs_table.php | 2 +- .../2017_12_20_004147_create_navdata_tables.php | 2 +- .../2017_12_20_005147_create_acars_tables.php | 4 ++-- .../2018_01_03_014930_create_stats_table.php | 2 +- .../migrations/2018_01_08_142204_create_news_table.php | 2 +- .../2018_01_28_180522_create_awards_table.php | 2 +- .../2018_02_26_185121_create_expenses_table.php | 2 +- ..._02_28_231807_create_journal_transactions_table.php | 2 +- .../2018_02_28_231813_create_journals_table.php | 2 +- .../2018_02_28_232438_create_ledgers_table.php | 2 +- .../2018_04_01_193443_create_files_table.php | 4 ++-- app/Http/Controllers/Admin/AircraftController.php | 2 +- app/Http/Controllers/Admin/AirlinesController.php | 2 +- app/Http/Controllers/Admin/AirportController.php | 2 +- app/Http/Controllers/Admin/AwardController.php | 2 +- app/Http/Controllers/Admin/DashboardController.php | 2 +- app/Http/Controllers/Admin/ExpenseController.php | 2 +- app/Http/Controllers/Admin/FareController.php | 2 +- app/Http/Controllers/Admin/FileController.php | 2 +- app/Http/Controllers/Admin/FinanceController.php | 2 +- app/Http/Controllers/Admin/FlightController.php | 2 +- app/Http/Controllers/Admin/FlightFieldController.php | 2 +- app/Http/Controllers/Admin/PirepController.php | 2 +- app/Http/Controllers/Admin/PirepFieldController.php | 2 +- app/Http/Controllers/Admin/RankController.php | 2 +- app/Http/Controllers/Admin/RolesController.php | 2 +- app/Http/Controllers/Admin/SettingsController.php | 2 +- app/Http/Controllers/Admin/SubfleetController.php | 2 +- app/Http/Controllers/Admin/UserController.php | 2 +- app/Http/Controllers/Api/AcarsController.php | 2 +- app/Http/Controllers/Api/AirlineController.php | 2 +- app/Http/Controllers/Api/AirportController.php | 2 +- app/Http/Controllers/Api/FleetController.php | 2 +- app/Http/Controllers/Api/FlightController.php | 2 +- app/Http/Controllers/Api/NewsController.php | 2 +- app/Http/Controllers/Api/PirepController.php | 2 +- app/Http/Controllers/Api/SettingsController.php | 2 +- app/Http/Controllers/Api/StatusController.php | 2 +- app/Http/Controllers/Api/UserController.php | 2 +- app/Http/Controllers/Auth/ForgotPasswordController.php | 2 +- app/Http/Controllers/Auth/LoginController.php | 2 +- app/Http/Controllers/Auth/RegisterController.php | 2 +- app/Http/Controllers/Auth/ResetPasswordController.php | 2 +- app/Http/Controllers/Frontend/AcarsController.php | 2 +- app/Http/Controllers/Frontend/AirportController.php | 2 +- app/Http/Controllers/Frontend/DashboardController.php | 2 +- app/Http/Controllers/Frontend/DownloadController.php | 2 +- app/Http/Controllers/Frontend/FlightController.php | 2 +- app/Http/Controllers/Frontend/HomeController.php | 2 +- app/Http/Controllers/Frontend/PirepController.php | 2 +- app/Http/Controllers/Frontend/ProfileController.php | 2 +- app/Http/Controllers/Frontend/UserController.php | 2 +- app/Http/Requests/Acars/CommentRequest.php | 2 +- app/Http/Requests/Acars/EventRequest.php | 2 +- app/Http/Requests/Acars/FieldsRequest.php | 2 +- app/Http/Requests/Acars/FileRequest.php | 2 +- app/Http/Requests/Acars/LogRequest.php | 2 +- app/Http/Requests/Acars/PositionRequest.php | 2 +- app/Http/Requests/Acars/PrefileRequest.php | 2 +- app/Http/Requests/Acars/RouteRequest.php | 2 +- app/Http/Requests/Acars/UpdateRequest.php | 2 +- app/Http/Resources/Response.php | 2 +- app/Listeners/AwardListener.php | 2 +- app/Listeners/ExpenseListener.php | 2 +- app/Listeners/FinanceEvents.php | 2 +- app/Listeners/NotificationEvents.php | 2 +- app/Models/Acars.php | 2 +- app/Models/Aircraft.php | 2 +- app/Models/Airline.php | 2 +- app/Models/Airport.php | 2 +- app/Models/Award.php | 2 +- app/Models/Bid.php | 2 +- app/Models/Enums/AcarsType.php | 2 +- app/Models/Enums/ActiveState.php | 2 +- app/Models/Enums/AircraftState.php | 2 +- app/Models/Enums/AircraftStatus.php | 2 +- app/Models/Enums/AnalyticsDimensions.php | 2 +- app/Models/Enums/AnalyticsMetrics.php | 2 +- app/Models/Enums/Days.php | 2 +- app/Models/Enums/ExpenseType.php | 2 +- app/Models/Enums/FlightType.php | 2 +- app/Models/Enums/FuelType.php | 2 +- app/Models/Enums/JournalType.php | 2 +- app/Models/Enums/NavaidType.php | 2 +- app/Models/Enums/PirepFieldSource.php | 2 +- app/Models/Enums/PirepSource.php | 2 +- app/Models/Enums/PirepState.php | 2 +- app/Models/Enums/PirepStatus.php | 2 +- app/Models/Enums/UserState.php | 2 +- app/Models/Expense.php | 2 +- app/Models/Fare.php | 2 +- app/Models/File.php | 2 +- app/Models/Flight.php | 2 +- app/Models/FlightField.php | 2 +- app/Models/FlightFieldValue.php | 2 +- app/Models/Journal.php | 2 +- app/Models/JournalTransaction.php | 2 +- app/Models/Ledger.php | 2 +- app/Models/Navdata.php | 2 +- app/Models/News.php | 2 +- app/Models/Pirep.php | 2 +- app/Models/PirepComment.php | 2 +- app/Models/PirepFare.php | 2 +- app/Models/PirepField.php | 2 +- app/Models/PirepFieldValue.php | 2 +- app/Models/Rank.php | 2 +- app/Models/Setting.php | 2 +- app/Models/Subfleet.php | 2 +- app/Models/Traits/HashIdTrait.php | 2 +- app/Models/Traits/ReferenceTrait.php | 8 ++++---- app/Models/UserAward.php | 2 +- app/Repositories/AcarsRepository.php | 2 +- app/Repositories/AircraftRepository.php | 2 +- app/Repositories/AirlineRepository.php | 2 +- app/Repositories/AirportRepository.php | 2 +- app/Repositories/AwardRepository.php | 2 +- app/Repositories/ExpenseRepository.php | 2 +- app/Repositories/FareRepository.php | 2 +- app/Repositories/FlightFieldRepository.php | 2 +- app/Repositories/FlightRepository.php | 2 +- app/Repositories/JournalRepository.php | 2 +- app/Repositories/NavdataRepository.php | 2 +- app/Repositories/NewsRepository.php | 2 +- app/Repositories/PermissionsRepository.php | 2 +- app/Repositories/PirepFieldRepository.php | 2 +- app/Repositories/PirepRepository.php | 2 +- app/Repositories/RankRepository.php | 2 +- app/Repositories/RoleRepository.php | 2 +- app/Repositories/SettingRepository.php | 2 +- app/Repositories/SubfleetRepository.php | 2 +- app/Repositories/UserRepository.php | 2 +- app/Services/AnalyticsService.php | 2 +- app/Services/AwardService.php | 4 ++-- app/Services/DatabaseService.php | 2 +- app/Services/ExportService.php | 4 ++-- app/Services/FareService.php | 2 +- app/Services/FileService.php | 2 +- app/Services/Finance/PirepFinanceService.php | 2 +- app/Services/Finance/RecurringFinanceService.php | 2 +- app/Services/FleetService.php | 2 +- app/Services/FlightService.php | 2 +- app/Services/GeoService.php | 2 +- app/Services/ImportExport/AircraftExporter.php | 2 +- app/Services/ImportExport/AircraftImporter.php | 2 +- app/Services/ImportExport/AirportExporter.php | 2 +- app/Services/ImportExport/AirportImporter.php | 2 +- app/Services/ImportExport/ExpenseExporter.php | 2 +- app/Services/ImportExport/ExpenseImporter.php | 2 +- app/Services/ImportExport/FareExporter.php | 2 +- app/Services/ImportExport/FareImporter.php | 2 +- app/Services/ImportExport/FlightExporter.php | 2 +- app/Services/ImportExport/FlightImporter.php | 2 +- app/Services/ImportExport/SubfleetExporter.php | 2 +- app/Services/ImportExport/SubfleetImporter.php | 2 +- app/Services/ImportService.php | 4 ++-- app/Services/Installer/MigrationService.php | 2 +- app/Services/Metar/AviationWeather.php | 2 +- app/Services/ModuleService.php | 2 +- app/Services/PirepService.php | 2 +- app/Services/UserService.php | 2 +- app/Support/Units/Altitude.php | 2 +- app/Support/Units/Distance.php | 2 +- app/Support/Units/Fuel.php | 2 +- app/Support/Units/Mass.php | 2 +- app/Support/Units/Pressure.php | 2 +- app/Support/Units/Temperature.php | 2 +- app/Support/Units/Velocity.php | 2 +- app/Support/Units/Volume.php | 2 +- app/Widgets/AirspaceMap.php | 2 +- app/Widgets/LatestNews.php | 2 +- app/Widgets/LatestPilots.php | 2 +- app/Widgets/LatestPireps.php | 2 +- app/Widgets/LiveMap.php | 2 +- app/Widgets/Weather.php | 4 ++-- .../Installer/Http/Controllers/InstallerController.php | 2 +- .../Installer/Http/Controllers/UpdaterController.php | 2 +- modules/Installer/Services/ConfigService.php | 2 +- modules/Installer/Services/DatabaseService.php | 2 +- modules/Installer/Services/RequirementsService.php | 2 +- modules/Sample/Awards/SampleAward.php | 2 +- .../Sample/Http/Controllers/Admin/AdminController.php | 2 +- .../Sample/Http/Controllers/Api/SampleController.php | 2 +- modules/Sample/Http/Controllers/SampleController.php | 2 +- modules/Sample/Models/SampleTable.php | 2 +- tests/ImporterTest.php | 2 +- tests/TestCase.php | 2 +- 223 files changed, 241 insertions(+), 241 deletions(-) rename app/{Interfaces => Contracts}/Award.php (98%) rename app/{Interfaces => Contracts}/Controller.php (99%) rename app/{Interfaces => Contracts}/Enum.php (99%) rename app/{Interfaces => Contracts}/FormRequest.php (92%) rename app/{Interfaces => Contracts}/ImportExport.php (99%) rename app/{Interfaces => Contracts}/Listener.php (70%) rename app/{Interfaces => Contracts}/Metar.php (98%) rename app/{Interfaces => Contracts}/Migration.php (97%) rename app/{Interfaces => Contracts}/Model.php (92%) rename app/{Interfaces => Contracts}/Repository.php (99%) rename app/{Interfaces => Contracts}/Service.php (69%) rename app/{Interfaces => Contracts}/Unit.php (98%) rename app/{Interfaces => Contracts}/Widget.php (94%) diff --git a/app/Awards/PilotFlightAwards.php b/app/Awards/PilotFlightAwards.php index 4955550d..2af6adbb 100644 --- a/app/Awards/PilotFlightAwards.php +++ b/app/Awards/PilotFlightAwards.php @@ -2,7 +2,7 @@ namespace App\Awards; -use App\Interfaces\Award; +use App\Contracts\Award; /** * Simple example of an awards class, where you can apply an award when a user diff --git a/app/Interfaces/Award.php b/app/Contracts/Award.php similarity index 98% rename from app/Interfaces/Award.php rename to app/Contracts/Award.php index 2301e126..d30732c8 100644 --- a/app/Interfaces/Award.php +++ b/app/Contracts/Award.php @@ -1,6 +1,6 @@ string('id', \App\Interfaces\Model::ID_MAX_LENGTH); + $table->string('id', \App\Contracts\Model::ID_MAX_LENGTH); $table->unsignedInteger('airline_id'); $table->unsignedInteger('flight_number'); $table->string('route_code', 5)->nullable(); @@ -47,7 +47,7 @@ class CreateFlightTables extends Migration }); Schema::create('flight_fare', function (Blueprint $table) { - $table->string('flight_id', \App\Interfaces\Model::ID_MAX_LENGTH); + $table->string('flight_id', \App\Contracts\Model::ID_MAX_LENGTH); $table->unsignedInteger('fare_id'); $table->string('price', 10)->nullable(); $table->string('cost', 10)->nullable(); @@ -71,7 +71,7 @@ class CreateFlightTables extends Migration */ Schema::create('flight_field_values', function (Blueprint $table) { $table->bigIncrements('id'); - $table->string('flight_id', \App\Interfaces\Model::ID_MAX_LENGTH); + $table->string('flight_id', \App\Contracts\Model::ID_MAX_LENGTH); $table->string('name', 50); $table->string('slug', 50)->nullable(); $table->text('value'); @@ -83,7 +83,7 @@ class CreateFlightTables extends Migration Schema::create('flight_subfleet', function (Blueprint $table) { $table->bigIncrements('id'); $table->unsignedInteger('subfleet_id'); - $table->string('flight_id', \App\Interfaces\Model::ID_MAX_LENGTH); + $table->string('flight_id', \App\Contracts\Model::ID_MAX_LENGTH); $table->index(['subfleet_id', 'flight_id']); $table->index(['flight_id', 'subfleet_id']); diff --git a/app/Database/migrations/2017_06_21_165410_create_ranks_table.php b/app/Database/migrations/2017_06_21_165410_create_ranks_table.php index a4568167..390192f9 100644 --- a/app/Database/migrations/2017_06_21_165410_create_ranks_table.php +++ b/app/Database/migrations/2017_06_21_165410_create_ranks_table.php @@ -1,6 +1,6 @@ string('id', \App\Interfaces\Model::ID_MAX_LENGTH); + $table->string('id', \App\Contracts\Model::ID_MAX_LENGTH); $table->unsignedInteger('user_id'); $table->unsignedInteger('airline_id'); $table->unsignedInteger('aircraft_id')->nullable(); @@ -57,7 +57,7 @@ class CreatePirepTables extends Migration Schema::create('pirep_comments', function (Blueprint $table) { $table->bigIncrements('id'); - $table->string('pirep_id', \App\Interfaces\Model::ID_MAX_LENGTH); + $table->string('pirep_id', \App\Contracts\Model::ID_MAX_LENGTH); $table->unsignedInteger('user_id'); $table->text('comment'); $table->timestamps(); @@ -65,7 +65,7 @@ class CreatePirepTables extends Migration Schema::create('pirep_fares', function (Blueprint $table) { $table->bigIncrements('id'); - $table->string('pirep_id', \App\Interfaces\Model::ID_MAX_LENGTH); + $table->string('pirep_id', \App\Contracts\Model::ID_MAX_LENGTH); $table->unsignedInteger('fare_id'); $table->unsignedInteger('count')->nullable()->default(0); @@ -81,7 +81,7 @@ class CreatePirepTables extends Migration Schema::create('pirep_field_values', function (Blueprint $table) { $table->bigIncrements('id'); - $table->string('pirep_id', \App\Interfaces\Model::ID_MAX_LENGTH); + $table->string('pirep_id', \App\Contracts\Model::ID_MAX_LENGTH); $table->string('name', 50); $table->string('slug', 50)->nullable(); $table->string('value')->nullable(); diff --git a/app/Database/migrations/2017_12_12_174519_create_bids_table.php b/app/Database/migrations/2017_12_12_174519_create_bids_table.php index 1763551f..5682ac60 100644 --- a/app/Database/migrations/2017_12_12_174519_create_bids_table.php +++ b/app/Database/migrations/2017_12_12_174519_create_bids_table.php @@ -1,6 +1,6 @@ increments('id'); $table->unsignedInteger('user_id'); - $table->string('flight_id', \App\Interfaces\Model::ID_MAX_LENGTH); + $table->string('flight_id', \App\Contracts\Model::ID_MAX_LENGTH); $table->timestamps(); $table->index('user_id'); diff --git a/app/Database/migrations/2017_12_14_225241_create_jobs_table.php b/app/Database/migrations/2017_12_14_225241_create_jobs_table.php index a1061ce5..33bf17dc 100644 --- a/app/Database/migrations/2017_12_14_225241_create_jobs_table.php +++ b/app/Database/migrations/2017_12_14_225241_create_jobs_table.php @@ -1,6 +1,6 @@ string('id', 12); - $table->string('pirep_id', \App\Interfaces\Model::ID_MAX_LENGTH); + $table->string('pirep_id', \App\Contracts\Model::ID_MAX_LENGTH); $table->unsignedTinyInteger('type'); $table->unsignedInteger('nav_type')->nullable(); $table->unsignedInteger('order')->default(0); diff --git a/app/Database/migrations/2018_01_03_014930_create_stats_table.php b/app/Database/migrations/2018_01_03_014930_create_stats_table.php index cb3a15f1..f31631e3 100644 --- a/app/Database/migrations/2018_01_03_014930_create_stats_table.php +++ b/app/Database/migrations/2018_01_03_014930_create_stats_table.php @@ -1,6 +1,6 @@ string('id', \App\Interfaces\Model::ID_MAX_LENGTH); + $table->string('id', \App\Contracts\Model::ID_MAX_LENGTH); $table->string('name'); $table->string('description')->nullable(); $table->string('disk')->nullable(); diff --git a/app/Http/Controllers/Admin/AircraftController.php b/app/Http/Controllers/Admin/AircraftController.php index d5e7372e..945a2968 100644 --- a/app/Http/Controllers/Admin/AircraftController.php +++ b/app/Http/Controllers/Admin/AircraftController.php @@ -5,7 +5,7 @@ namespace App\Http\Controllers\Admin; use App\Http\Requests\CreateAircraftRequest; use App\Http\Requests\ImportRequest; use App\Http\Requests\UpdateAircraftRequest; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Models\Aircraft; use App\Models\Enums\AircraftStatus; use App\Models\Expense; diff --git a/app/Http/Controllers/Admin/AirlinesController.php b/app/Http/Controllers/Admin/AirlinesController.php index 7536a435..545642d1 100644 --- a/app/Http/Controllers/Admin/AirlinesController.php +++ b/app/Http/Controllers/Admin/AirlinesController.php @@ -4,7 +4,7 @@ namespace App\Http\Controllers\Admin; use App\Http\Requests\CreateAirlineRequest; use App\Http\Requests\UpdateAirlineRequest; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Repositories\AirlineRepository; use App\Support\Countries; use Flash; diff --git a/app/Http/Controllers/Admin/AirportController.php b/app/Http/Controllers/Admin/AirportController.php index 21c3bcec..f8cff82f 100644 --- a/app/Http/Controllers/Admin/AirportController.php +++ b/app/Http/Controllers/Admin/AirportController.php @@ -5,7 +5,7 @@ namespace App\Http\Controllers\Admin; use App\Http\Requests\CreateAirportRequest; use App\Http\Requests\ImportRequest; use App\Http\Requests\UpdateAirportRequest; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Models\Airport; use App\Models\Expense; use App\Repositories\AirportRepository; diff --git a/app/Http/Controllers/Admin/AwardController.php b/app/Http/Controllers/Admin/AwardController.php index 4d4c68ac..3a1fd182 100755 --- a/app/Http/Controllers/Admin/AwardController.php +++ b/app/Http/Controllers/Admin/AwardController.php @@ -4,7 +4,7 @@ namespace App\Http\Controllers\Admin; use App\Http\Requests\CreateAwardRequest; use App\Http\Requests\UpdateAwardRequest; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Repositories\AwardRepository; use App\Services\AwardService; use Flash; diff --git a/app/Http/Controllers/Admin/DashboardController.php b/app/Http/Controllers/Admin/DashboardController.php index 63e2055b..73e74e48 100644 --- a/app/Http/Controllers/Admin/DashboardController.php +++ b/app/Http/Controllers/Admin/DashboardController.php @@ -3,7 +3,7 @@ namespace App\Http\Controllers\Admin; use App\Facades\Utils; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Repositories\NewsRepository; use App\Repositories\PirepRepository; use App\Repositories\UserRepository; diff --git a/app/Http/Controllers/Admin/ExpenseController.php b/app/Http/Controllers/Admin/ExpenseController.php index c2582fc9..fd3e0456 100644 --- a/app/Http/Controllers/Admin/ExpenseController.php +++ b/app/Http/Controllers/Admin/ExpenseController.php @@ -3,7 +3,7 @@ namespace App\Http\Controllers\Admin; use App\Http\Requests\ImportRequest; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Models\Enums\ExpenseType; use App\Models\Expense; use App\Repositories\AirlineRepository; diff --git a/app/Http/Controllers/Admin/FareController.php b/app/Http/Controllers/Admin/FareController.php index 12905b33..a6c1f932 100644 --- a/app/Http/Controllers/Admin/FareController.php +++ b/app/Http/Controllers/Admin/FareController.php @@ -5,7 +5,7 @@ namespace App\Http\Controllers\Admin; use App\Http\Requests\CreateFareRequest; use App\Http\Requests\ImportRequest; use App\Http\Requests\UpdateFareRequest; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Repositories\FareRepository; use App\Services\ExportService; use App\Services\ImportService; diff --git a/app/Http/Controllers/Admin/FileController.php b/app/Http/Controllers/Admin/FileController.php index c9627b61..cf59f09d 100644 --- a/app/Http/Controllers/Admin/FileController.php +++ b/app/Http/Controllers/Admin/FileController.php @@ -2,7 +2,7 @@ namespace App\Http\Controllers\Admin; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Models\File; use App\Services\FileService; use Flash; diff --git a/app/Http/Controllers/Admin/FinanceController.php b/app/Http/Controllers/Admin/FinanceController.php index 62c65b73..574871a8 100644 --- a/app/Http/Controllers/Admin/FinanceController.php +++ b/app/Http/Controllers/Admin/FinanceController.php @@ -2,7 +2,7 @@ namespace App\Http\Controllers\Admin; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Models\Enums\JournalType; use App\Models\Journal; use App\Models\JournalTransaction; diff --git a/app/Http/Controllers/Admin/FlightController.php b/app/Http/Controllers/Admin/FlightController.php index 5331ae3c..171de0b1 100644 --- a/app/Http/Controllers/Admin/FlightController.php +++ b/app/Http/Controllers/Admin/FlightController.php @@ -4,7 +4,7 @@ namespace App\Http\Controllers\Admin; use App\Http\Requests\CreateFlightRequest; use App\Http\Requests\UpdateFlightRequest; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Models\Enums\Days; use App\Models\Enums\FlightType; use App\Models\Flight; diff --git a/app/Http/Controllers/Admin/FlightFieldController.php b/app/Http/Controllers/Admin/FlightFieldController.php index 452959fb..b2d99488 100644 --- a/app/Http/Controllers/Admin/FlightFieldController.php +++ b/app/Http/Controllers/Admin/FlightFieldController.php @@ -2,7 +2,7 @@ namespace App\Http\Controllers\Admin; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Repositories\FlightFieldRepository; use Flash; use Illuminate\Http\Request; diff --git a/app/Http/Controllers/Admin/PirepController.php b/app/Http/Controllers/Admin/PirepController.php index e7a33454..9e1ccb81 100644 --- a/app/Http/Controllers/Admin/PirepController.php +++ b/app/Http/Controllers/Admin/PirepController.php @@ -5,7 +5,7 @@ namespace App\Http\Controllers\Admin; use App\Facades\Utils; use App\Http\Requests\CreatePirepRequest; use App\Http\Requests\UpdatePirepRequest; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Models\Enums\PirepSource; use App\Models\Enums\PirepState; use App\Models\Pirep; diff --git a/app/Http/Controllers/Admin/PirepFieldController.php b/app/Http/Controllers/Admin/PirepFieldController.php index c6638d1c..9b8abc94 100644 --- a/app/Http/Controllers/Admin/PirepFieldController.php +++ b/app/Http/Controllers/Admin/PirepFieldController.php @@ -4,7 +4,7 @@ namespace App\Http\Controllers\Admin; use App\Http\Requests\CreatePirepFieldRequest; use App\Http\Requests\UpdatePirepFieldRequest; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Repositories\PirepFieldRepository; use Flash; use Illuminate\Http\Request; diff --git a/app/Http/Controllers/Admin/RankController.php b/app/Http/Controllers/Admin/RankController.php index 8aed2b35..79bd3d5e 100644 --- a/app/Http/Controllers/Admin/RankController.php +++ b/app/Http/Controllers/Admin/RankController.php @@ -4,7 +4,7 @@ namespace App\Http\Controllers\Admin; use App\Http\Requests\CreateRankRequest; use App\Http\Requests\UpdateRankRequest; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Repositories\RankRepository; use App\Repositories\SubfleetRepository; use App\Services\FleetService; diff --git a/app/Http/Controllers/Admin/RolesController.php b/app/Http/Controllers/Admin/RolesController.php index 4c691c51..1ccf112f 100644 --- a/app/Http/Controllers/Admin/RolesController.php +++ b/app/Http/Controllers/Admin/RolesController.php @@ -4,7 +4,7 @@ namespace App\Http\Controllers\Admin; use App\Http\Requests\CreateRoleRequest; use App\Http\Requests\UpdateRoleRequest; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Repositories\PermissionsRepository; use App\Repositories\RoleRepository; use Flash; diff --git a/app/Http/Controllers/Admin/SettingsController.php b/app/Http/Controllers/Admin/SettingsController.php index ecef6bb6..70ce68be 100644 --- a/app/Http/Controllers/Admin/SettingsController.php +++ b/app/Http/Controllers/Admin/SettingsController.php @@ -2,7 +2,7 @@ namespace App\Http\Controllers\Admin; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Models\Setting; use Illuminate\Http\Request; use Log; diff --git a/app/Http/Controllers/Admin/SubfleetController.php b/app/Http/Controllers/Admin/SubfleetController.php index 071a699a..62e86dab 100644 --- a/app/Http/Controllers/Admin/SubfleetController.php +++ b/app/Http/Controllers/Admin/SubfleetController.php @@ -5,7 +5,7 @@ namespace App\Http\Controllers\Admin; use App\Http\Requests\CreateSubfleetRequest; use App\Http\Requests\ImportRequest; use App\Http\Requests\UpdateSubfleetRequest; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Models\Airline; use App\Models\Enums\FuelType; use App\Models\Expense; diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 431a9bdc..a36e9e57 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -5,7 +5,7 @@ namespace App\Http\Controllers\Admin; use App\Facades\Utils; use App\Http\Requests\CreateUserRequest; use App\Http\Requests\UpdateUserRequest; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Models\Rank; use App\Models\Role; use App\Models\User; diff --git a/app/Http/Controllers/Api/AcarsController.php b/app/Http/Controllers/Api/AcarsController.php index 155bf740..18e5ba30 100644 --- a/app/Http/Controllers/Api/AcarsController.php +++ b/app/Http/Controllers/Api/AcarsController.php @@ -7,7 +7,7 @@ use App\Http\Requests\Acars\EventRequest; use App\Http\Requests\Acars\LogRequest; use App\Http\Requests\Acars\PositionRequest; use App\Http\Resources\AcarsRoute as AcarsRouteResource; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Models\Acars; use App\Models\Enums\AcarsType; use App\Models\Enums\PirepStatus; diff --git a/app/Http/Controllers/Api/AirlineController.php b/app/Http/Controllers/Api/AirlineController.php index 293aba68..7259fa37 100644 --- a/app/Http/Controllers/Api/AirlineController.php +++ b/app/Http/Controllers/Api/AirlineController.php @@ -3,7 +3,7 @@ namespace App\Http\Controllers\Api; use App\Http\Resources\Airline as AirlineResource; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Repositories\AirlineRepository; use Illuminate\Http\Request; diff --git a/app/Http/Controllers/Api/AirportController.php b/app/Http/Controllers/Api/AirportController.php index b450ea32..b86aef1d 100644 --- a/app/Http/Controllers/Api/AirportController.php +++ b/app/Http/Controllers/Api/AirportController.php @@ -3,7 +3,7 @@ namespace App\Http\Controllers\Api; use App\Http\Resources\Airport as AirportResource; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Repositories\AirportRepository; use Illuminate\Http\Request; use Illuminate\Support\Facades\Cache; diff --git a/app/Http/Controllers/Api/FleetController.php b/app/Http/Controllers/Api/FleetController.php index 81d7c731..06a1eb09 100644 --- a/app/Http/Controllers/Api/FleetController.php +++ b/app/Http/Controllers/Api/FleetController.php @@ -4,7 +4,7 @@ namespace App\Http\Controllers\Api; use App\Http\Resources\Aircraft as AircraftResource; use App\Http\Resources\Subfleet as SubfleetResource; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Repositories\AircraftRepository; use App\Repositories\SubfleetRepository; use Illuminate\Http\Request; diff --git a/app/Http/Controllers/Api/FlightController.php b/app/Http/Controllers/Api/FlightController.php index b67515b7..e005e46d 100644 --- a/app/Http/Controllers/Api/FlightController.php +++ b/app/Http/Controllers/Api/FlightController.php @@ -4,7 +4,7 @@ namespace App\Http\Controllers\Api; use App\Http\Resources\Flight as FlightResource; use App\Http\Resources\Navdata as NavdataResource; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Repositories\Criteria\WhereCriteria; use App\Repositories\FlightRepository; use App\Services\FlightService; diff --git a/app/Http/Controllers/Api/NewsController.php b/app/Http/Controllers/Api/NewsController.php index 8abe9574..92931898 100644 --- a/app/Http/Controllers/Api/NewsController.php +++ b/app/Http/Controllers/Api/NewsController.php @@ -3,7 +3,7 @@ namespace App\Http\Controllers\Api; use App\Http\Resources\News as NewsResource; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Repositories\NewsRepository; use Illuminate\Http\Request; diff --git a/app/Http/Controllers/Api/PirepController.php b/app/Http/Controllers/Api/PirepController.php index 8bc068c0..1c865bd7 100644 --- a/app/Http/Controllers/Api/PirepController.php +++ b/app/Http/Controllers/Api/PirepController.php @@ -17,7 +17,7 @@ use App\Http\Resources\JournalTransaction as JournalTransactionResource; use App\Http\Resources\Pirep as PirepResource; use App\Http\Resources\PirepComment as PirepCommentResource; use App\Http\Resources\PirepFieldCollection; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Models\Acars; use App\Models\Enums\AcarsType; use App\Models\Enums\PirepFieldSource; diff --git a/app/Http/Controllers/Api/SettingsController.php b/app/Http/Controllers/Api/SettingsController.php index a4c66205..d769162a 100644 --- a/app/Http/Controllers/Api/SettingsController.php +++ b/app/Http/Controllers/Api/SettingsController.php @@ -3,7 +3,7 @@ namespace App\Http\Controllers\Api; use App\Http\Resources\Setting as SettingResource; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Repositories\SettingRepository; use Illuminate\Http\Request; diff --git a/app/Http/Controllers/Api/StatusController.php b/app/Http/Controllers/Api/StatusController.php index c8202ae3..7574b7b7 100644 --- a/app/Http/Controllers/Api/StatusController.php +++ b/app/Http/Controllers/Api/StatusController.php @@ -2,7 +2,7 @@ namespace App\Http\Controllers\Api; -use App\Interfaces\Controller; +use App\Contracts\Controller; use PragmaRX\Version\Package\Facade as Version; /** diff --git a/app/Http/Controllers/Api/UserController.php b/app/Http/Controllers/Api/UserController.php index 323c3caa..900f59a7 100644 --- a/app/Http/Controllers/Api/UserController.php +++ b/app/Http/Controllers/Api/UserController.php @@ -6,7 +6,7 @@ use App\Http\Resources\Bid as BidResource; use App\Http\Resources\Pirep as PirepResource; use App\Http\Resources\Subfleet as SubfleetResource; use App\Http\Resources\User as UserResource; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Models\Bid; use App\Models\Enums\PirepState; use App\Repositories\Criteria\WhereCriteria; diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index c3f9b98c..297f5554 100755 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -2,7 +2,7 @@ namespace App\Http\Controllers\Auth; -use App\Interfaces\Controller; +use App\Contracts\Controller; use Illuminate\Foundation\Auth\SendsPasswordResetEmails; /** diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 05ed692a..dd685123 100755 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -2,7 +2,7 @@ namespace App\Http\Controllers\Auth; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Models\Enums\UserState; use Illuminate\Foundation\Auth\AuthenticatesUsers; use Illuminate\Http\Request; diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 7bbf337b..87cd251e 100755 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -3,7 +3,7 @@ namespace App\Http\Controllers\Auth; use App\Facades\Utils; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Models\Enums\UserState; use App\Models\User; use App\Repositories\AirlineRepository; diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php index 9db44aed..4786ae71 100755 --- a/app/Http/Controllers/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/Auth/ResetPasswordController.php @@ -2,7 +2,7 @@ namespace App\Http\Controllers\Auth; -use App\Interfaces\Controller; +use App\Contracts\Controller; use Illuminate\Foundation\Auth\ResetsPasswords; use Illuminate\Http\Request; diff --git a/app/Http/Controllers/Frontend/AcarsController.php b/app/Http/Controllers/Frontend/AcarsController.php index d35cc805..77d4eddc 100644 --- a/app/Http/Controllers/Frontend/AcarsController.php +++ b/app/Http/Controllers/Frontend/AcarsController.php @@ -2,7 +2,7 @@ namespace App\Http\Controllers\Frontend; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Repositories\AcarsRepository; use App\Services\GeoService; use Illuminate\Http\Request; diff --git a/app/Http/Controllers/Frontend/AirportController.php b/app/Http/Controllers/Frontend/AirportController.php index f9039252..ba28127c 100644 --- a/app/Http/Controllers/Frontend/AirportController.php +++ b/app/Http/Controllers/Frontend/AirportController.php @@ -2,7 +2,7 @@ namespace App\Http\Controllers\Frontend; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Repositories\AirportRepository; use App\Repositories\FlightRepository; use Flash; diff --git a/app/Http/Controllers/Frontend/DashboardController.php b/app/Http/Controllers/Frontend/DashboardController.php index 74b9525e..460675c3 100644 --- a/app/Http/Controllers/Frontend/DashboardController.php +++ b/app/Http/Controllers/Frontend/DashboardController.php @@ -2,7 +2,7 @@ namespace App\Http\Controllers\Frontend; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Repositories\PirepRepository; use Illuminate\Support\Facades\Auth; diff --git a/app/Http/Controllers/Frontend/DownloadController.php b/app/Http/Controllers/Frontend/DownloadController.php index fb6d8e9b..8208a19f 100644 --- a/app/Http/Controllers/Frontend/DownloadController.php +++ b/app/Http/Controllers/Frontend/DownloadController.php @@ -2,7 +2,7 @@ namespace App\Http\Controllers\Frontend; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Models\File; use Auth; use Flash; diff --git a/app/Http/Controllers/Frontend/FlightController.php b/app/Http/Controllers/Frontend/FlightController.php index bb06e139..2533d7b6 100644 --- a/app/Http/Controllers/Frontend/FlightController.php +++ b/app/Http/Controllers/Frontend/FlightController.php @@ -2,7 +2,7 @@ namespace App\Http\Controllers\Frontend; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Models\Bid; use App\Repositories\AirlineRepository; use App\Repositories\AirportRepository; diff --git a/app/Http/Controllers/Frontend/HomeController.php b/app/Http/Controllers/Frontend/HomeController.php index a79580ef..be63f83d 100644 --- a/app/Http/Controllers/Frontend/HomeController.php +++ b/app/Http/Controllers/Frontend/HomeController.php @@ -2,7 +2,7 @@ namespace App\Http\Controllers\Frontend; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Models\User; use Illuminate\Database\QueryException; use Log; diff --git a/app/Http/Controllers/Frontend/PirepController.php b/app/Http/Controllers/Frontend/PirepController.php index 7c3c8e83..37c641b6 100644 --- a/app/Http/Controllers/Frontend/PirepController.php +++ b/app/Http/Controllers/Frontend/PirepController.php @@ -5,7 +5,7 @@ namespace App\Http\Controllers\Frontend; use App\Facades\Utils; use App\Http\Requests\CreatePirepRequest; use App\Http\Requests\UpdatePirepRequest; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Models\Enums\PirepSource; use App\Models\Enums\PirepState; use App\Models\Pirep; diff --git a/app/Http/Controllers/Frontend/ProfileController.php b/app/Http/Controllers/Frontend/ProfileController.php index 2cec3dfe..7a06e49d 100644 --- a/app/Http/Controllers/Frontend/ProfileController.php +++ b/app/Http/Controllers/Frontend/ProfileController.php @@ -3,7 +3,7 @@ namespace App\Http\Controllers\Frontend; use App\Facades\Utils; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Models\User; use App\Repositories\AirlineRepository; use App\Repositories\AirportRepository; diff --git a/app/Http/Controllers/Frontend/UserController.php b/app/Http/Controllers/Frontend/UserController.php index e3214702..5942f1ca 100644 --- a/app/Http/Controllers/Frontend/UserController.php +++ b/app/Http/Controllers/Frontend/UserController.php @@ -2,7 +2,7 @@ namespace App\Http\Controllers\Frontend; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Models\Enums\UserState; use App\Repositories\Criteria\WhereCriteria; use App\Repositories\UserRepository; diff --git a/app/Http/Requests/Acars/CommentRequest.php b/app/Http/Requests/Acars/CommentRequest.php index 1493c185..c8052b7b 100644 --- a/app/Http/Requests/Acars/CommentRequest.php +++ b/app/Http/Requests/Acars/CommentRequest.php @@ -2,7 +2,7 @@ namespace App\Http\Requests\Acars; -use App\Interfaces\FormRequest; +use App\Contracts\FormRequest; /** * Class CommentRequest diff --git a/app/Http/Requests/Acars/EventRequest.php b/app/Http/Requests/Acars/EventRequest.php index 94447e64..da747e45 100644 --- a/app/Http/Requests/Acars/EventRequest.php +++ b/app/Http/Requests/Acars/EventRequest.php @@ -2,7 +2,7 @@ namespace App\Http\Requests\Acars; -use App\Interfaces\FormRequest; +use App\Contracts\FormRequest; use App\Models\Pirep; use Auth; diff --git a/app/Http/Requests/Acars/FieldsRequest.php b/app/Http/Requests/Acars/FieldsRequest.php index 683469ae..f5045bf2 100644 --- a/app/Http/Requests/Acars/FieldsRequest.php +++ b/app/Http/Requests/Acars/FieldsRequest.php @@ -2,7 +2,7 @@ namespace App\Http\Requests\Acars; -use App\Interfaces\FormRequest; +use App\Contracts\FormRequest; /** * Class PrefileRequest diff --git a/app/Http/Requests/Acars/FileRequest.php b/app/Http/Requests/Acars/FileRequest.php index 4e857afc..1c7a54f0 100644 --- a/app/Http/Requests/Acars/FileRequest.php +++ b/app/Http/Requests/Acars/FileRequest.php @@ -2,7 +2,7 @@ namespace App\Http\Requests\Acars; -use App\Interfaces\FormRequest; +use App\Contracts\FormRequest; use App\Models\Pirep; use Auth; diff --git a/app/Http/Requests/Acars/LogRequest.php b/app/Http/Requests/Acars/LogRequest.php index 9964ca82..a0ddaf4e 100644 --- a/app/Http/Requests/Acars/LogRequest.php +++ b/app/Http/Requests/Acars/LogRequest.php @@ -2,7 +2,7 @@ namespace App\Http\Requests\Acars; -use App\Interfaces\FormRequest; +use App\Contracts\FormRequest; use App\Models\Pirep; use Auth; diff --git a/app/Http/Requests/Acars/PositionRequest.php b/app/Http/Requests/Acars/PositionRequest.php index d637ca4d..f46e2836 100644 --- a/app/Http/Requests/Acars/PositionRequest.php +++ b/app/Http/Requests/Acars/PositionRequest.php @@ -2,7 +2,7 @@ namespace App\Http\Requests\Acars; -use App\Interfaces\FormRequest; +use App\Contracts\FormRequest; use App\Models\Pirep; use Auth; diff --git a/app/Http/Requests/Acars/PrefileRequest.php b/app/Http/Requests/Acars/PrefileRequest.php index cadd5e60..9c2c81de 100644 --- a/app/Http/Requests/Acars/PrefileRequest.php +++ b/app/Http/Requests/Acars/PrefileRequest.php @@ -2,7 +2,7 @@ namespace App\Http\Requests\Acars; -use App\Interfaces\FormRequest; +use App\Contracts\FormRequest; /** * Class PrefileRequest diff --git a/app/Http/Requests/Acars/RouteRequest.php b/app/Http/Requests/Acars/RouteRequest.php index 8d70027e..7195a947 100644 --- a/app/Http/Requests/Acars/RouteRequest.php +++ b/app/Http/Requests/Acars/RouteRequest.php @@ -2,7 +2,7 @@ namespace App\Http\Requests\Acars; -use App\Interfaces\FormRequest; +use App\Contracts\FormRequest; use App\Models\Pirep; use Auth; diff --git a/app/Http/Requests/Acars/UpdateRequest.php b/app/Http/Requests/Acars/UpdateRequest.php index 926b2b20..320ecab7 100644 --- a/app/Http/Requests/Acars/UpdateRequest.php +++ b/app/Http/Requests/Acars/UpdateRequest.php @@ -2,7 +2,7 @@ namespace App\Http\Requests\Acars; -use App\Interfaces\FormRequest; +use App\Contracts\FormRequest; use App\Models\Pirep; use Auth; diff --git a/app/Http/Resources/Response.php b/app/Http/Resources/Response.php index cdce41b3..10962f9e 100644 --- a/app/Http/Resources/Response.php +++ b/app/Http/Resources/Response.php @@ -2,7 +2,7 @@ namespace App\Http\Resources; -use App\Interfaces\Unit; +use App\Contracts\Unit; use Illuminate\Http\Resources\Json\Resource; /** diff --git a/app/Listeners/AwardListener.php b/app/Listeners/AwardListener.php index 3efc4ae4..557fbbde 100644 --- a/app/Listeners/AwardListener.php +++ b/app/Listeners/AwardListener.php @@ -3,7 +3,7 @@ namespace App\Listeners; use App\Events\UserStatsChanged; -use App\Interfaces\Listener; +use App\Contracts\Listener; use App\Models\Award; /** diff --git a/app/Listeners/ExpenseListener.php b/app/Listeners/ExpenseListener.php index 544f83d5..45151ead 100644 --- a/app/Listeners/ExpenseListener.php +++ b/app/Listeners/ExpenseListener.php @@ -3,7 +3,7 @@ namespace App\Listeners; use App\Events\Expenses; -use App\Interfaces\Listener; +use App\Contracts\Listener; /** * Class ExpenseListener diff --git a/app/Listeners/FinanceEvents.php b/app/Listeners/FinanceEvents.php index 49d24015..6ae14ce3 100644 --- a/app/Listeners/FinanceEvents.php +++ b/app/Listeners/FinanceEvents.php @@ -4,7 +4,7 @@ namespace App\Listeners; use App\Events\PirepAccepted; use App\Events\PirepRejected; -use App\Interfaces\Listener; +use App\Contracts\Listener; use App\Services\Finance\PirepFinanceService; use Illuminate\Contracts\Events\Dispatcher; diff --git a/app/Listeners/NotificationEvents.php b/app/Listeners/NotificationEvents.php index 15721ab8..ef41b83f 100644 --- a/app/Listeners/NotificationEvents.php +++ b/app/Listeners/NotificationEvents.php @@ -4,7 +4,7 @@ namespace App\Listeners; use App\Events\UserRegistered; use App\Events\UserStateChanged; -use App\Interfaces\Listener; +use App\Contracts\Listener; use App\Models\Enums\UserState; use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Support\Facades\Mail; diff --git a/app/Models/Acars.php b/app/Models/Acars.php index 66188c37..cc68cbb0 100644 --- a/app/Models/Acars.php +++ b/app/Models/Acars.php @@ -2,7 +2,7 @@ namespace App\Models; -use App\Interfaces\Model; +use App\Contracts\Model; use App\Models\Traits\HashIdTrait; use App\Support\Units\Distance; use App\Support\Units\Fuel; diff --git a/app/Models/Aircraft.php b/app/Models/Aircraft.php index 24071969..c2d75f4d 100644 --- a/app/Models/Aircraft.php +++ b/app/Models/Aircraft.php @@ -2,7 +2,7 @@ namespace App\Models; -use App\Interfaces\Model; +use App\Contracts\Model; use App\Models\Enums\AircraftStatus; use App\Models\Traits\ExpensableTrait; use App\Models\Traits\FilesTrait; diff --git a/app/Models/Airline.php b/app/Models/Airline.php index 47cc0e9e..2c073a74 100644 --- a/app/Models/Airline.php +++ b/app/Models/Airline.php @@ -2,7 +2,7 @@ namespace App\Models; -use App\Interfaces\Model; +use App\Contracts\Model; use App\Models\Enums\JournalType; use App\Models\Traits\FilesTrait; use App\Models\Traits\JournalTrait; diff --git a/app/Models/Airport.php b/app/Models/Airport.php index 7054a7c7..04111aea 100644 --- a/app/Models/Airport.php +++ b/app/Models/Airport.php @@ -2,7 +2,7 @@ namespace App\Models; -use App\Interfaces\Model; +use App\Contracts\Model; use App\Models\Traits\ExpensableTrait; use App\Models\Traits\FilesTrait; diff --git a/app/Models/Award.php b/app/Models/Award.php index 9f624759..632ba861 100755 --- a/app/Models/Award.php +++ b/app/Models/Award.php @@ -2,7 +2,7 @@ namespace App\Models; -use App\Interfaces\Model; +use App\Contracts\Model; /** * The Award model diff --git a/app/Models/Bid.php b/app/Models/Bid.php index 3d559d00..c8235c97 100644 --- a/app/Models/Bid.php +++ b/app/Models/Bid.php @@ -2,7 +2,7 @@ namespace App\Models; -use App\Interfaces\Model; +use App\Contracts\Model; class Bid extends Model { diff --git a/app/Models/Enums/AcarsType.php b/app/Models/Enums/AcarsType.php index a6e1a4f0..980e57c2 100644 --- a/app/Models/Enums/AcarsType.php +++ b/app/Models/Enums/AcarsType.php @@ -2,7 +2,7 @@ namespace App\Models\Enums; -use App\Interfaces\Enum; +use App\Contracts\Enum; /** * Class AcarsType diff --git a/app/Models/Enums/ActiveState.php b/app/Models/Enums/ActiveState.php index 5af5daf8..031ee2a2 100644 --- a/app/Models/Enums/ActiveState.php +++ b/app/Models/Enums/ActiveState.php @@ -2,7 +2,7 @@ namespace App\Models\Enums; -use App\Interfaces\Enum; +use App\Contracts\Enum; /** * Class ActiveState diff --git a/app/Models/Enums/AircraftState.php b/app/Models/Enums/AircraftState.php index f81cfe81..2179a5ed 100644 --- a/app/Models/Enums/AircraftState.php +++ b/app/Models/Enums/AircraftState.php @@ -2,7 +2,7 @@ namespace App\Models\Enums; -use App\Interfaces\Enum; +use App\Contracts\Enum; /** * Class AircraftState diff --git a/app/Models/Enums/AircraftStatus.php b/app/Models/Enums/AircraftStatus.php index 18de63e2..9c60765c 100644 --- a/app/Models/Enums/AircraftStatus.php +++ b/app/Models/Enums/AircraftStatus.php @@ -2,7 +2,7 @@ namespace App\Models\Enums; -use App\Interfaces\Enum; +use App\Contracts\Enum; /** * Class AircraftState diff --git a/app/Models/Enums/AnalyticsDimensions.php b/app/Models/Enums/AnalyticsDimensions.php index d654d59a..506fc06f 100644 --- a/app/Models/Enums/AnalyticsDimensions.php +++ b/app/Models/Enums/AnalyticsDimensions.php @@ -2,7 +2,7 @@ namespace App\Models\Enums; -use App\Interfaces\Enum; +use App\Contracts\Enum; /** * Class AnalyticsDimensions diff --git a/app/Models/Enums/AnalyticsMetrics.php b/app/Models/Enums/AnalyticsMetrics.php index d5963e2a..550f2e6c 100644 --- a/app/Models/Enums/AnalyticsMetrics.php +++ b/app/Models/Enums/AnalyticsMetrics.php @@ -2,7 +2,7 @@ namespace App\Models\Enums; -use App\Interfaces\Enum; +use App\Contracts\Enum; /** * Class AnalyticsMetrics diff --git a/app/Models/Enums/Days.php b/app/Models/Enums/Days.php index 5733aaec..e0ff5986 100644 --- a/app/Models/Enums/Days.php +++ b/app/Models/Enums/Days.php @@ -2,7 +2,7 @@ namespace App\Models\Enums; -use App\Interfaces\Enum; +use App\Contracts\Enum; /** * Class Days diff --git a/app/Models/Enums/ExpenseType.php b/app/Models/Enums/ExpenseType.php index 396ffcaa..5154885e 100644 --- a/app/Models/Enums/ExpenseType.php +++ b/app/Models/Enums/ExpenseType.php @@ -2,7 +2,7 @@ namespace App\Models\Enums; -use App\Interfaces\Enum; +use App\Contracts\Enum; /** * Class ExpenseType diff --git a/app/Models/Enums/FlightType.php b/app/Models/Enums/FlightType.php index 47681232..c3254e34 100644 --- a/app/Models/Enums/FlightType.php +++ b/app/Models/Enums/FlightType.php @@ -2,7 +2,7 @@ namespace App\Models\Enums; -use App\Interfaces\Enum; +use App\Contracts\Enum; /** * Class FlightType diff --git a/app/Models/Enums/FuelType.php b/app/Models/Enums/FuelType.php index bbaf6bba..d5d1c3ae 100644 --- a/app/Models/Enums/FuelType.php +++ b/app/Models/Enums/FuelType.php @@ -2,7 +2,7 @@ namespace App\Models\Enums; -use App\Interfaces\Enum; +use App\Contracts\Enum; /** * Class FuelType diff --git a/app/Models/Enums/JournalType.php b/app/Models/Enums/JournalType.php index 61d2151f..6321cb49 100644 --- a/app/Models/Enums/JournalType.php +++ b/app/Models/Enums/JournalType.php @@ -2,7 +2,7 @@ namespace App\Models\Enums; -use App\Interfaces\Enum; +use App\Contracts\Enum; /** * Class JournalType diff --git a/app/Models/Enums/NavaidType.php b/app/Models/Enums/NavaidType.php index 4cda1c52..f663fb51 100644 --- a/app/Models/Enums/NavaidType.php +++ b/app/Models/Enums/NavaidType.php @@ -2,7 +2,7 @@ namespace App\Models\Enums; -use App\Interfaces\Enum; +use App\Contracts\Enum; /** * Class NavaidType diff --git a/app/Models/Enums/PirepFieldSource.php b/app/Models/Enums/PirepFieldSource.php index aec5809a..7270fd97 100644 --- a/app/Models/Enums/PirepFieldSource.php +++ b/app/Models/Enums/PirepFieldSource.php @@ -2,7 +2,7 @@ namespace App\Models\Enums; -use App\Interfaces\Enum; +use App\Contracts\Enum; /** * Class AcarsType diff --git a/app/Models/Enums/PirepSource.php b/app/Models/Enums/PirepSource.php index eba5835e..9b837ba6 100644 --- a/app/Models/Enums/PirepSource.php +++ b/app/Models/Enums/PirepSource.php @@ -2,7 +2,7 @@ namespace App\Models\Enums; -use App\Interfaces\Enum; +use App\Contracts\Enum; /** * Class PirepSource diff --git a/app/Models/Enums/PirepState.php b/app/Models/Enums/PirepState.php index 8938da35..50f7ec05 100644 --- a/app/Models/Enums/PirepState.php +++ b/app/Models/Enums/PirepState.php @@ -2,7 +2,7 @@ namespace App\Models\Enums; -use App\Interfaces\Enum; +use App\Contracts\Enum; /** * Class PirepState diff --git a/app/Models/Enums/PirepStatus.php b/app/Models/Enums/PirepStatus.php index c9afc1af..0bef4bd7 100644 --- a/app/Models/Enums/PirepStatus.php +++ b/app/Models/Enums/PirepStatus.php @@ -2,7 +2,7 @@ namespace App\Models\Enums; -use App\Interfaces\Enum; +use App\Contracts\Enum; /** * Tied to the ACARS statuses/states. diff --git a/app/Models/Enums/UserState.php b/app/Models/Enums/UserState.php index 104689b7..516b4399 100644 --- a/app/Models/Enums/UserState.php +++ b/app/Models/Enums/UserState.php @@ -2,7 +2,7 @@ namespace App\Models\Enums; -use App\Interfaces\Enum; +use App\Contracts\Enum; /** * Class UserState diff --git a/app/Models/Expense.php b/app/Models/Expense.php index 501c9388..15e0fd85 100644 --- a/app/Models/Expense.php +++ b/app/Models/Expense.php @@ -2,7 +2,7 @@ namespace App\Models; -use App\Interfaces\Model; +use App\Contracts\Model; use App\Models\Traits\ReferenceTrait; /** diff --git a/app/Models/Fare.php b/app/Models/Fare.php index 1e2c90c8..c4cc8df6 100644 --- a/app/Models/Fare.php +++ b/app/Models/Fare.php @@ -2,7 +2,7 @@ namespace App\Models; -use App\Interfaces\Model; +use App\Contracts\Model; /** * Class Fare diff --git a/app/Models/File.php b/app/Models/File.php index dcdd5f38..013018a4 100644 --- a/app/Models/File.php +++ b/app/Models/File.php @@ -2,7 +2,7 @@ namespace App\Models; -use App\Interfaces\Model; +use App\Contracts\Model; use App\Models\Traits\HashIdTrait; use App\Models\Traits\ReferenceTrait; use Illuminate\Support\Facades\Storage; diff --git a/app/Models/Flight.php b/app/Models/Flight.php index e88b8e4b..390a6224 100644 --- a/app/Models/Flight.php +++ b/app/Models/Flight.php @@ -2,7 +2,7 @@ namespace App\Models; -use App\Interfaces\Model; +use App\Contracts\Model; use App\Models\Enums\Days; use App\Models\Traits\HashIdTrait; use App\Support\Units\Distance; diff --git a/app/Models/FlightField.php b/app/Models/FlightField.php index 92af3d0e..f337fbb5 100644 --- a/app/Models/FlightField.php +++ b/app/Models/FlightField.php @@ -2,7 +2,7 @@ namespace App\Models; -use App\Interfaces\Model; +use App\Contracts\Model; /** * Class FlightField diff --git a/app/Models/FlightFieldValue.php b/app/Models/FlightFieldValue.php index 13a0ad78..f835c24a 100644 --- a/app/Models/FlightFieldValue.php +++ b/app/Models/FlightFieldValue.php @@ -2,7 +2,7 @@ namespace App\Models; -use App\Interfaces\Model; +use App\Contracts\Model; /** * Class FlightFieldValue diff --git a/app/Models/Journal.php b/app/Models/Journal.php index 8672dcc9..506c6b1e 100644 --- a/app/Models/Journal.php +++ b/app/Models/Journal.php @@ -6,7 +6,7 @@ namespace App\Models; -use App\Interfaces\Model; +use App\Contracts\Model; use App\Support\Money; use Carbon\Carbon; diff --git a/app/Models/JournalTransaction.php b/app/Models/JournalTransaction.php index 21aa51e0..1311fb25 100644 --- a/app/Models/JournalTransaction.php +++ b/app/Models/JournalTransaction.php @@ -6,7 +6,7 @@ namespace App\Models; -use App\Interfaces\Model; +use App\Contracts\Model; use App\Models\Traits\ReferenceTrait; /** diff --git a/app/Models/Ledger.php b/app/Models/Ledger.php index cf175a0b..25433536 100644 --- a/app/Models/Ledger.php +++ b/app/Models/Ledger.php @@ -6,7 +6,7 @@ namespace App\Models; -use App\Interfaces\Model; +use App\Contracts\Model; use App\Support\Money; use Carbon\Carbon; diff --git a/app/Models/Navdata.php b/app/Models/Navdata.php index 92a0dc52..3f0f4bad 100644 --- a/app/Models/Navdata.php +++ b/app/Models/Navdata.php @@ -2,7 +2,7 @@ namespace App\Models; -use App\Interfaces\Model; +use App\Contracts\Model; /** * Class Navdata diff --git a/app/Models/News.php b/app/Models/News.php index 6c0957a4..549f969d 100644 --- a/app/Models/News.php +++ b/app/Models/News.php @@ -2,7 +2,7 @@ namespace App\Models; -use App\Interfaces\Model; +use App\Contracts\Model; /** * Class News diff --git a/app/Models/Pirep.php b/app/Models/Pirep.php index c0090300..d9d228a7 100644 --- a/app/Models/Pirep.php +++ b/app/Models/Pirep.php @@ -2,7 +2,7 @@ namespace App\Models; -use App\Interfaces\Model; +use App\Contracts\Model; use App\Models\Enums\AcarsType; use App\Models\Enums\PirepFieldSource; use App\Models\Enums\PirepState; diff --git a/app/Models/PirepComment.php b/app/Models/PirepComment.php index 16e890fc..be8cd527 100644 --- a/app/Models/PirepComment.php +++ b/app/Models/PirepComment.php @@ -2,7 +2,7 @@ namespace App\Models; -use App\Interfaces\Model; +use App\Contracts\Model; /** * Class PirepEvent diff --git a/app/Models/PirepFare.php b/app/Models/PirepFare.php index 7ada428f..53a120bf 100644 --- a/app/Models/PirepFare.php +++ b/app/Models/PirepFare.php @@ -2,7 +2,7 @@ namespace App\Models; -use App\Interfaces\Model; +use App\Contracts\Model; /** * Class PirepFare diff --git a/app/Models/PirepField.php b/app/Models/PirepField.php index 957447b3..5dd66558 100644 --- a/app/Models/PirepField.php +++ b/app/Models/PirepField.php @@ -2,7 +2,7 @@ namespace App\Models; -use App\Interfaces\Model; +use App\Contracts\Model; /** * Class PirepField diff --git a/app/Models/PirepFieldValue.php b/app/Models/PirepFieldValue.php index 4ebcb2f1..4c9305c9 100644 --- a/app/Models/PirepFieldValue.php +++ b/app/Models/PirepFieldValue.php @@ -2,7 +2,7 @@ namespace App\Models; -use App\Interfaces\Model; +use App\Contracts\Model; use App\Models\Enums\PirepFieldSource; /** diff --git a/app/Models/Rank.php b/app/Models/Rank.php index 7be73c94..8cb685ae 100644 --- a/app/Models/Rank.php +++ b/app/Models/Rank.php @@ -2,7 +2,7 @@ namespace App\Models; -use App\Interfaces\Model; +use App\Contracts\Model; /** * Class Rank diff --git a/app/Models/Setting.php b/app/Models/Setting.php index 87cc1273..bead1cf9 100644 --- a/app/Models/Setting.php +++ b/app/Models/Setting.php @@ -2,7 +2,7 @@ namespace App\Models; -use App\Interfaces\Model; +use App\Contracts\Model; /** * Class Setting diff --git a/app/Models/Subfleet.php b/app/Models/Subfleet.php index 6e743ea2..91999614 100644 --- a/app/Models/Subfleet.php +++ b/app/Models/Subfleet.php @@ -2,7 +2,7 @@ namespace App\Models; -use App\Interfaces\Model; +use App\Contracts\Model; use App\Models\Enums\AircraftStatus; use App\Models\Traits\ExpensableTrait; diff --git a/app/Models/Traits/HashIdTrait.php b/app/Models/Traits/HashIdTrait.php index c90022d5..71ab4848 100644 --- a/app/Models/Traits/HashIdTrait.php +++ b/app/Models/Traits/HashIdTrait.php @@ -2,7 +2,7 @@ namespace App\Models\Traits; -use App\Interfaces\Model; +use App\Contracts\Model; use Hashids\Hashids; trait HashIdTrait diff --git a/app/Models/Traits/ReferenceTrait.php b/app/Models/Traits/ReferenceTrait.php index 5867d0be..f7305830 100644 --- a/app/Models/Traits/ReferenceTrait.php +++ b/app/Models/Traits/ReferenceTrait.php @@ -5,13 +5,13 @@ namespace App\Models\Traits; /** * Trait ReferenceTrait * - * @property \App\Interfaces\Model $ref_model - * @property mixed $ref_model_id + * @property \App\Contracts\Model $ref_model + * @property mixed $ref_model_id */ trait ReferenceTrait { /** - * @param \App\Interfaces\Model $object + * @param \App\Contracts\Model $object * * @return self */ @@ -27,7 +27,7 @@ trait ReferenceTrait /** * Return an instance of the object or null * - * @return \App\Interfaces\Model|null + * @return \App\Contracts\Model|null */ public function getReferencedObject() { diff --git a/app/Models/UserAward.php b/app/Models/UserAward.php index f9d75bf6..f7c9bfba 100644 --- a/app/Models/UserAward.php +++ b/app/Models/UserAward.php @@ -2,7 +2,7 @@ namespace App\Models; -use App\Interfaces\Model; +use App\Contracts\Model; /** * Class UserAward diff --git a/app/Repositories/AcarsRepository.php b/app/Repositories/AcarsRepository.php index 65abfe09..ac14e2db 100644 --- a/app/Repositories/AcarsRepository.php +++ b/app/Repositories/AcarsRepository.php @@ -2,7 +2,7 @@ namespace App\Repositories; -use App\Interfaces\Repository; +use App\Contracts\Repository; use App\Models\Acars; use App\Models\Enums\AcarsType; use App\Models\Enums\PirepState; diff --git a/app/Repositories/AircraftRepository.php b/app/Repositories/AircraftRepository.php index a273aeee..d1a381aa 100644 --- a/app/Repositories/AircraftRepository.php +++ b/app/Repositories/AircraftRepository.php @@ -2,7 +2,7 @@ namespace App\Repositories; -use App\Interfaces\Repository; +use App\Contracts\Repository; use App\Models\Aircraft; use Prettus\Repository\Contracts\CacheableInterface; use Prettus\Repository\Traits\CacheableRepository; diff --git a/app/Repositories/AirlineRepository.php b/app/Repositories/AirlineRepository.php index 6f98c042..d4581871 100644 --- a/app/Repositories/AirlineRepository.php +++ b/app/Repositories/AirlineRepository.php @@ -2,7 +2,7 @@ namespace App\Repositories; -use App\Interfaces\Repository; +use App\Contracts\Repository; use App\Models\Airline; use Prettus\Repository\Contracts\CacheableInterface; use Prettus\Repository\Traits\CacheableRepository; diff --git a/app/Repositories/AirportRepository.php b/app/Repositories/AirportRepository.php index ee67414b..4f7b3c47 100644 --- a/app/Repositories/AirportRepository.php +++ b/app/Repositories/AirportRepository.php @@ -2,7 +2,7 @@ namespace App\Repositories; -use App\Interfaces\Repository; +use App\Contracts\Repository; use App\Models\Airport; use Prettus\Repository\Contracts\CacheableInterface; use Prettus\Repository\Traits\CacheableRepository; diff --git a/app/Repositories/AwardRepository.php b/app/Repositories/AwardRepository.php index 5511ecba..c3620a98 100755 --- a/app/Repositories/AwardRepository.php +++ b/app/Repositories/AwardRepository.php @@ -2,7 +2,7 @@ namespace App\Repositories; -use App\Interfaces\Repository; +use App\Contracts\Repository; use App\Models\Award; use Prettus\Repository\Contracts\CacheableInterface; use Prettus\Repository\Traits\CacheableRepository; diff --git a/app/Repositories/ExpenseRepository.php b/app/Repositories/ExpenseRepository.php index 5b1e8018..cc7c0448 100644 --- a/app/Repositories/ExpenseRepository.php +++ b/app/Repositories/ExpenseRepository.php @@ -2,7 +2,7 @@ namespace App\Repositories; -use App\Interfaces\Repository; +use App\Contracts\Repository; use App\Models\Expense; use Illuminate\Support\Collection; use Prettus\Repository\Contracts\CacheableInterface; diff --git a/app/Repositories/FareRepository.php b/app/Repositories/FareRepository.php index 4ca6159e..7b5a3c6a 100644 --- a/app/Repositories/FareRepository.php +++ b/app/Repositories/FareRepository.php @@ -2,7 +2,7 @@ namespace App\Repositories; -use App\Interfaces\Repository; +use App\Contracts\Repository; use App\Models\Fare; use Prettus\Repository\Contracts\CacheableInterface; use Prettus\Repository\Traits\CacheableRepository; diff --git a/app/Repositories/FlightFieldRepository.php b/app/Repositories/FlightFieldRepository.php index 4e5db697..5149f37e 100644 --- a/app/Repositories/FlightFieldRepository.php +++ b/app/Repositories/FlightFieldRepository.php @@ -2,7 +2,7 @@ namespace App\Repositories; -use App\Interfaces\Repository; +use App\Contracts\Repository; use App\Models\FlightField; /** diff --git a/app/Repositories/FlightRepository.php b/app/Repositories/FlightRepository.php index 4850f4aa..0a5223ef 100644 --- a/app/Repositories/FlightRepository.php +++ b/app/Repositories/FlightRepository.php @@ -2,7 +2,7 @@ namespace App\Repositories; -use App\Interfaces\Repository; +use App\Contracts\Repository; use App\Models\Flight; use App\Repositories\Criteria\WhereCriteria; use Illuminate\Http\Request; diff --git a/app/Repositories/JournalRepository.php b/app/Repositories/JournalRepository.php index ba650495..a64b77f1 100644 --- a/app/Repositories/JournalRepository.php +++ b/app/Repositories/JournalRepository.php @@ -2,7 +2,7 @@ namespace App\Repositories; -use App\Interfaces\Repository; +use App\Contracts\Repository; use App\Models\Journal; use App\Models\JournalTransaction; use App\Support\Money; diff --git a/app/Repositories/NavdataRepository.php b/app/Repositories/NavdataRepository.php index b7ef3316..92600b9f 100644 --- a/app/Repositories/NavdataRepository.php +++ b/app/Repositories/NavdataRepository.php @@ -2,7 +2,7 @@ namespace App\Repositories; -use App\Interfaces\Repository; +use App\Contracts\Repository; use App\Models\Navdata; use Prettus\Repository\Contracts\CacheableInterface; use Prettus\Repository\Traits\CacheableRepository; diff --git a/app/Repositories/NewsRepository.php b/app/Repositories/NewsRepository.php index cada9239..a62d1018 100644 --- a/app/Repositories/NewsRepository.php +++ b/app/Repositories/NewsRepository.php @@ -2,7 +2,7 @@ namespace App\Repositories; -use App\Interfaces\Repository; +use App\Contracts\Repository; use App\Models\News; use Prettus\Repository\Contracts\CacheableInterface; use Prettus\Repository\Traits\CacheableRepository; diff --git a/app/Repositories/PermissionsRepository.php b/app/Repositories/PermissionsRepository.php index c36177b0..db944ae8 100644 --- a/app/Repositories/PermissionsRepository.php +++ b/app/Repositories/PermissionsRepository.php @@ -2,7 +2,7 @@ namespace App\Repositories; -use App\Interfaces\Repository; +use App\Contracts\Repository; use App\Models\Permission; use Prettus\Repository\Contracts\CacheableInterface; use Prettus\Repository\Traits\CacheableRepository; diff --git a/app/Repositories/PirepFieldRepository.php b/app/Repositories/PirepFieldRepository.php index 861f65bf..c110840e 100644 --- a/app/Repositories/PirepFieldRepository.php +++ b/app/Repositories/PirepFieldRepository.php @@ -2,7 +2,7 @@ namespace App\Repositories; -use App\Interfaces\Repository; +use App\Contracts\Repository; use App\Models\PirepField; /** diff --git a/app/Repositories/PirepRepository.php b/app/Repositories/PirepRepository.php index 774efd9e..800c395e 100644 --- a/app/Repositories/PirepRepository.php +++ b/app/Repositories/PirepRepository.php @@ -2,7 +2,7 @@ namespace App\Repositories; -use App\Interfaces\Repository; +use App\Contracts\Repository; use App\Models\Enums\PirepState; use App\Models\Pirep; use App\Models\User; diff --git a/app/Repositories/RankRepository.php b/app/Repositories/RankRepository.php index 659b6e3b..537d8bfa 100644 --- a/app/Repositories/RankRepository.php +++ b/app/Repositories/RankRepository.php @@ -2,7 +2,7 @@ namespace App\Repositories; -use App\Interfaces\Repository; +use App\Contracts\Repository; use App\Models\Rank; use Prettus\Repository\Contracts\CacheableInterface; use Prettus\Repository\Traits\CacheableRepository; diff --git a/app/Repositories/RoleRepository.php b/app/Repositories/RoleRepository.php index 60d5a7df..38b8148f 100644 --- a/app/Repositories/RoleRepository.php +++ b/app/Repositories/RoleRepository.php @@ -2,7 +2,7 @@ namespace App\Repositories; -use App\Interfaces\Repository; +use App\Contracts\Repository; use App\Models\Role; use Prettus\Repository\Contracts\CacheableInterface; use Prettus\Repository\Traits\CacheableRepository; diff --git a/app/Repositories/SettingRepository.php b/app/Repositories/SettingRepository.php index 960cc952..dfc76746 100644 --- a/app/Repositories/SettingRepository.php +++ b/app/Repositories/SettingRepository.php @@ -3,7 +3,7 @@ namespace App\Repositories; use App\Exceptions\SettingNotFound; -use App\Interfaces\Repository; +use App\Contracts\Repository; use App\Models\Setting; use Illuminate\Support\Carbon; use Log; diff --git a/app/Repositories/SubfleetRepository.php b/app/Repositories/SubfleetRepository.php index ccd6caa0..774e4a17 100644 --- a/app/Repositories/SubfleetRepository.php +++ b/app/Repositories/SubfleetRepository.php @@ -2,7 +2,7 @@ namespace App\Repositories; -use App\Interfaces\Repository; +use App\Contracts\Repository; use App\Models\Subfleet; use Prettus\Repository\Contracts\CacheableInterface; use Prettus\Repository\Traits\CacheableRepository; diff --git a/app/Repositories/UserRepository.php b/app/Repositories/UserRepository.php index e3f614a9..416d7ed3 100644 --- a/app/Repositories/UserRepository.php +++ b/app/Repositories/UserRepository.php @@ -2,7 +2,7 @@ namespace App\Repositories; -use App\Interfaces\Repository; +use App\Contracts\Repository; use App\Models\Enums\UserState; use App\Models\User; use App\Repositories\Criteria\WhereCriteria; diff --git a/app/Services/AnalyticsService.php b/app/Services/AnalyticsService.php index 03704cf1..05dd47ed 100644 --- a/app/Services/AnalyticsService.php +++ b/app/Services/AnalyticsService.php @@ -2,7 +2,7 @@ namespace App\Services; -use App\Interfaces\Service; +use App\Contracts\Service; use App\Models\Enums\AnalyticsDimensions; use DB; use Irazasyed\LaravelGAMP\Facades\GAMP; diff --git a/app/Services/AwardService.php b/app/Services/AwardService.php index c1684350..d42a1ad8 100644 --- a/app/Services/AwardService.php +++ b/app/Services/AwardService.php @@ -2,7 +2,7 @@ namespace App\Services; -use App\Interfaces\Service; +use App\Contracts\Service; use App\Support\ClassLoader; use Module; @@ -14,7 +14,7 @@ class AwardService extends Service /** * Find any of the award classes * - * @return \App\Interfaces\Award[] + * @return \App\Contracts\Award[] */ public function findAllAwardClasses(): array { diff --git a/app/Services/DatabaseService.php b/app/Services/DatabaseService.php index 7f724e7a..0168e06e 100644 --- a/app/Services/DatabaseService.php +++ b/app/Services/DatabaseService.php @@ -2,7 +2,7 @@ namespace App\Services; -use App\Interfaces\Service; +use App\Contracts\Service; use App\Support\Database; use Carbon\Carbon; use Webpatser\Uuid\Uuid; diff --git a/app/Services/ExportService.php b/app/Services/ExportService.php index b4ba117a..0b253d99 100644 --- a/app/Services/ExportService.php +++ b/app/Services/ExportService.php @@ -2,8 +2,8 @@ namespace App\Services; -use App\Interfaces\ImportExport; -use App\Interfaces\Service; +use App\Contracts\ImportExport; +use App\Contracts\Service; use App\Services\ImportExport\AircraftExporter; use App\Services\ImportExport\AirportExporter; use App\Services\ImportExport\ExpenseExporter; diff --git a/app/Services/FareService.php b/app/Services/FareService.php index bb8a0abd..12a29919 100644 --- a/app/Services/FareService.php +++ b/app/Services/FareService.php @@ -2,7 +2,7 @@ namespace App\Services; -use App\Interfaces\Service; +use App\Contracts\Service; use App\Models\Fare; use App\Models\Flight; use App\Models\Pirep; diff --git a/app/Services/FileService.php b/app/Services/FileService.php index 46a8730e..b9709a3c 100644 --- a/app/Services/FileService.php +++ b/app/Services/FileService.php @@ -2,7 +2,7 @@ namespace App\Services; -use App\Interfaces\Service; +use App\Contracts\Service; use App\Models\File; /** diff --git a/app/Services/Finance/PirepFinanceService.php b/app/Services/Finance/PirepFinanceService.php index c4a63c7a..855eafac 100644 --- a/app/Services/Finance/PirepFinanceService.php +++ b/app/Services/Finance/PirepFinanceService.php @@ -3,7 +3,7 @@ namespace App\Services\Finance; use App\Events\Expenses as ExpensesEvent; -use App\Interfaces\Service; +use App\Contracts\Service; use App\Models\Enums\ExpenseType; use App\Models\Enums\PirepSource; use App\Models\Expense; diff --git a/app/Services/Finance/RecurringFinanceService.php b/app/Services/Finance/RecurringFinanceService.php index 894a0b40..ed5edf33 100644 --- a/app/Services/Finance/RecurringFinanceService.php +++ b/app/Services/Finance/RecurringFinanceService.php @@ -2,7 +2,7 @@ namespace App\Services\Finance; -use App\Interfaces\Service; +use App\Contracts\Service; use App\Models\Airline; use App\Models\Enums\ExpenseType; use App\Models\Expense; diff --git a/app/Services/FleetService.php b/app/Services/FleetService.php index 659f5c17..3ef3e033 100644 --- a/app/Services/FleetService.php +++ b/app/Services/FleetService.php @@ -2,7 +2,7 @@ namespace App\Services; -use App\Interfaces\Service; +use App\Contracts\Service; use App\Models\Flight; use App\Models\Rank; use App\Models\Subfleet; diff --git a/app/Services/FlightService.php b/app/Services/FlightService.php index 4fc62bc5..404d8f4a 100644 --- a/app/Services/FlightService.php +++ b/app/Services/FlightService.php @@ -3,7 +3,7 @@ namespace App\Services; use App\Exceptions\BidExists; -use App\Interfaces\Service; +use App\Contracts\Service; use App\Models\Bid; use App\Models\Flight; use App\Models\FlightFieldValue; diff --git a/app/Services/GeoService.php b/app/Services/GeoService.php index f95f66fe..50ad1099 100644 --- a/app/Services/GeoService.php +++ b/app/Services/GeoService.php @@ -2,7 +2,7 @@ namespace App\Services; -use App\Interfaces\Service; +use App\Contracts\Service; use App\Models\Acars; use App\Models\Enums\AcarsType; use App\Models\Flight; diff --git a/app/Services/ImportExport/AircraftExporter.php b/app/Services/ImportExport/AircraftExporter.php index b5f92483..6b9a75c2 100644 --- a/app/Services/ImportExport/AircraftExporter.php +++ b/app/Services/ImportExport/AircraftExporter.php @@ -2,7 +2,7 @@ namespace App\Services\ImportExport; -use App\Interfaces\ImportExport; +use App\Contracts\ImportExport; use App\Models\Aircraft; /** diff --git a/app/Services/ImportExport/AircraftImporter.php b/app/Services/ImportExport/AircraftImporter.php index 2571b3a8..f90e833c 100644 --- a/app/Services/ImportExport/AircraftImporter.php +++ b/app/Services/ImportExport/AircraftImporter.php @@ -2,7 +2,7 @@ namespace App\Services\ImportExport; -use App\Interfaces\ImportExport; +use App\Contracts\ImportExport; use App\Models\Aircraft; use App\Models\Enums\AircraftState; use App\Models\Enums\AircraftStatus; diff --git a/app/Services/ImportExport/AirportExporter.php b/app/Services/ImportExport/AirportExporter.php index 4b36f6c6..09b5e79c 100644 --- a/app/Services/ImportExport/AirportExporter.php +++ b/app/Services/ImportExport/AirportExporter.php @@ -2,7 +2,7 @@ namespace App\Services\ImportExport; -use App\Interfaces\ImportExport; +use App\Contracts\ImportExport; use App\Models\Airport; /** diff --git a/app/Services/ImportExport/AirportImporter.php b/app/Services/ImportExport/AirportImporter.php index 765f72f3..8af821ad 100644 --- a/app/Services/ImportExport/AirportImporter.php +++ b/app/Services/ImportExport/AirportImporter.php @@ -2,7 +2,7 @@ namespace App\Services\ImportExport; -use App\Interfaces\ImportExport; +use App\Contracts\ImportExport; use App\Models\Airport; /** diff --git a/app/Services/ImportExport/ExpenseExporter.php b/app/Services/ImportExport/ExpenseExporter.php index 4b3ad9ed..bdb85046 100644 --- a/app/Services/ImportExport/ExpenseExporter.php +++ b/app/Services/ImportExport/ExpenseExporter.php @@ -2,7 +2,7 @@ namespace App\Services\ImportExport; -use App\Interfaces\ImportExport; +use App\Contracts\ImportExport; use App\Models\Aircraft; use App\Models\Airport; use App\Models\Expense; diff --git a/app/Services/ImportExport/ExpenseImporter.php b/app/Services/ImportExport/ExpenseImporter.php index 3599e74a..84d59ee9 100644 --- a/app/Services/ImportExport/ExpenseImporter.php +++ b/app/Services/ImportExport/ExpenseImporter.php @@ -2,7 +2,7 @@ namespace App\Services\ImportExport; -use App\Interfaces\ImportExport; +use App\Contracts\ImportExport; use App\Models\Aircraft; use App\Models\Airport; use App\Models\Expense; diff --git a/app/Services/ImportExport/FareExporter.php b/app/Services/ImportExport/FareExporter.php index 38f42de2..c8181bef 100644 --- a/app/Services/ImportExport/FareExporter.php +++ b/app/Services/ImportExport/FareExporter.php @@ -2,7 +2,7 @@ namespace App\Services\ImportExport; -use App\Interfaces\ImportExport; +use App\Contracts\ImportExport; use App\Models\Fare; /** diff --git a/app/Services/ImportExport/FareImporter.php b/app/Services/ImportExport/FareImporter.php index 96e33192..32a25c65 100644 --- a/app/Services/ImportExport/FareImporter.php +++ b/app/Services/ImportExport/FareImporter.php @@ -2,7 +2,7 @@ namespace App\Services\ImportExport; -use App\Interfaces\ImportExport; +use App\Contracts\ImportExport; use App\Models\Fare; /** diff --git a/app/Services/ImportExport/FlightExporter.php b/app/Services/ImportExport/FlightExporter.php index 4b01bc83..bffbb3f3 100644 --- a/app/Services/ImportExport/FlightExporter.php +++ b/app/Services/ImportExport/FlightExporter.php @@ -2,7 +2,7 @@ namespace App\Services\ImportExport; -use App\Interfaces\ImportExport; +use App\Contracts\ImportExport; use App\Models\Enums\Days; use App\Models\Flight; diff --git a/app/Services/ImportExport/FlightImporter.php b/app/Services/ImportExport/FlightImporter.php index 8b8527be..3b08ecc0 100644 --- a/app/Services/ImportExport/FlightImporter.php +++ b/app/Services/ImportExport/FlightImporter.php @@ -2,7 +2,7 @@ namespace App\Services\ImportExport; -use App\Interfaces\ImportExport; +use App\Contracts\ImportExport; use App\Models\Airport; use App\Models\Enums\Days; use App\Models\Enums\FlightType; diff --git a/app/Services/ImportExport/SubfleetExporter.php b/app/Services/ImportExport/SubfleetExporter.php index 9967ebdd..3e35f258 100644 --- a/app/Services/ImportExport/SubfleetExporter.php +++ b/app/Services/ImportExport/SubfleetExporter.php @@ -2,7 +2,7 @@ namespace App\Services\ImportExport; -use App\Interfaces\ImportExport; +use App\Contracts\ImportExport; use App\Models\Flight; use App\Models\Subfleet; diff --git a/app/Services/ImportExport/SubfleetImporter.php b/app/Services/ImportExport/SubfleetImporter.php index 7ff486eb..2449fc4c 100644 --- a/app/Services/ImportExport/SubfleetImporter.php +++ b/app/Services/ImportExport/SubfleetImporter.php @@ -2,7 +2,7 @@ namespace App\Services\ImportExport; -use App\Interfaces\ImportExport; +use App\Contracts\ImportExport; use App\Models\Fare; use App\Models\Subfleet; use App\Services\FareService; diff --git a/app/Services/ImportService.php b/app/Services/ImportService.php index 07afe8d1..652bdb8c 100644 --- a/app/Services/ImportService.php +++ b/app/Services/ImportService.php @@ -2,8 +2,8 @@ namespace App\Services; -use App\Interfaces\ImportExport; -use App\Interfaces\Service; +use App\Contracts\ImportExport; +use App\Contracts\Service; use App\Models\Airport; use App\Models\Expense; use App\Repositories\FlightRepository; diff --git a/app/Services/Installer/MigrationService.php b/app/Services/Installer/MigrationService.php index 0514c28f..bbcc5216 100644 --- a/app/Services/Installer/MigrationService.php +++ b/app/Services/Installer/MigrationService.php @@ -2,7 +2,7 @@ namespace App\Services\Installer; -use App\Interfaces\Service; +use App\Contracts\Service; use App\Models\Setting; use DB; use Log; diff --git a/app/Services/Metar/AviationWeather.php b/app/Services/Metar/AviationWeather.php index 91b38e71..a6c29b47 100644 --- a/app/Services/Metar/AviationWeather.php +++ b/app/Services/Metar/AviationWeather.php @@ -2,7 +2,7 @@ namespace App\Services\Metar; -use App\Interfaces\Metar; +use App\Contracts\Metar; use App\Support\Http; use Cache; diff --git a/app/Services/ModuleService.php b/app/Services/ModuleService.php index e57c4603..b1e9cf22 100644 --- a/app/Services/ModuleService.php +++ b/app/Services/ModuleService.php @@ -2,7 +2,7 @@ namespace App\Services; -use App\Interfaces\Service; +use App\Contracts\Service; /** * Class ModuleService diff --git a/app/Services/PirepService.php b/app/Services/PirepService.php index 8d2722c7..61b9aece 100644 --- a/app/Services/PirepService.php +++ b/app/Services/PirepService.php @@ -7,7 +7,7 @@ use App\Events\PirepFiled; use App\Events\PirepRejected; use App\Events\UserStateChanged; use App\Events\UserStatsChanged; -use App\Interfaces\Service; +use App\Contracts\Service; use App\Models\Acars; use App\Models\Bid; use App\Models\Enums\AcarsType; diff --git a/app/Services/UserService.php b/app/Services/UserService.php index fcc59515..0840e23f 100644 --- a/app/Services/UserService.php +++ b/app/Services/UserService.php @@ -5,7 +5,7 @@ namespace App\Services; use App\Events\UserRegistered; use App\Events\UserStateChanged; use App\Events\UserStatsChanged; -use App\Interfaces\Service; +use App\Contracts\Service; use App\Models\Enums\PirepState; use App\Models\Enums\UserState; use App\Models\Pirep; diff --git a/app/Support/Units/Altitude.php b/app/Support/Units/Altitude.php index 1cd8e164..d0c96b3a 100644 --- a/app/Support/Units/Altitude.php +++ b/app/Support/Units/Altitude.php @@ -2,7 +2,7 @@ namespace App\Support\Units; -use App\Interfaces\Unit; +use App\Contracts\Unit; use PhpUnitsOfMeasure\PhysicalQuantity\Length; class Altitude extends Unit diff --git a/app/Support/Units/Distance.php b/app/Support/Units/Distance.php index f7895da9..77ac51d9 100644 --- a/app/Support/Units/Distance.php +++ b/app/Support/Units/Distance.php @@ -2,7 +2,7 @@ namespace App\Support\Units; -use App\Interfaces\Unit; +use App\Contracts\Unit; use PhpUnitsOfMeasure\PhysicalQuantity\Length; class Distance extends Unit diff --git a/app/Support/Units/Fuel.php b/app/Support/Units/Fuel.php index 3cb424c3..204c7915 100644 --- a/app/Support/Units/Fuel.php +++ b/app/Support/Units/Fuel.php @@ -2,7 +2,7 @@ namespace App\Support\Units; -use App\Interfaces\Unit; +use App\Contracts\Unit; use PhpUnitsOfMeasure\PhysicalQuantity\Mass; class Fuel extends Unit diff --git a/app/Support/Units/Mass.php b/app/Support/Units/Mass.php index 258082bd..5bfded97 100644 --- a/app/Support/Units/Mass.php +++ b/app/Support/Units/Mass.php @@ -2,7 +2,7 @@ namespace App\Support\Units; -use App\Interfaces\Unit; +use App\Contracts\Unit; use PhpUnitsOfMeasure\PhysicalQuantity\Mass as MassUnit; class Mass extends Unit diff --git a/app/Support/Units/Pressure.php b/app/Support/Units/Pressure.php index 3a92f6f4..6d6c7580 100644 --- a/app/Support/Units/Pressure.php +++ b/app/Support/Units/Pressure.php @@ -2,7 +2,7 @@ namespace App\Support\Units; -use App\Interfaces\Unit; +use App\Contracts\Unit; use PhpUnitsOfMeasure\PhysicalQuantity\Pressure as PressureUnit; /** diff --git a/app/Support/Units/Temperature.php b/app/Support/Units/Temperature.php index 1a11f071..279252fe 100644 --- a/app/Support/Units/Temperature.php +++ b/app/Support/Units/Temperature.php @@ -2,7 +2,7 @@ namespace App\Support\Units; -use App\Interfaces\Unit; +use App\Contracts\Unit; use PhpUnitsOfMeasure\PhysicalQuantity\Temperature as TemperatureUnit; /** diff --git a/app/Support/Units/Velocity.php b/app/Support/Units/Velocity.php index ed6c20bc..e14197dc 100644 --- a/app/Support/Units/Velocity.php +++ b/app/Support/Units/Velocity.php @@ -2,7 +2,7 @@ namespace App\Support\Units; -use App\Interfaces\Unit; +use App\Contracts\Unit; use PhpUnitsOfMeasure\PhysicalQuantity\Velocity as VelocityUnit; /** diff --git a/app/Support/Units/Volume.php b/app/Support/Units/Volume.php index 9f8ba966..55fc121b 100644 --- a/app/Support/Units/Volume.php +++ b/app/Support/Units/Volume.php @@ -2,7 +2,7 @@ namespace App\Support\Units; -use App\Interfaces\Unit; +use App\Contracts\Unit; use PhpUnitsOfMeasure\PhysicalQuantity\Volume as VolumeUnit; /** diff --git a/app/Widgets/AirspaceMap.php b/app/Widgets/AirspaceMap.php index 7a591331..6974061a 100644 --- a/app/Widgets/AirspaceMap.php +++ b/app/Widgets/AirspaceMap.php @@ -2,7 +2,7 @@ namespace App\Widgets; -use App\Interfaces\Widget; +use App\Contracts\Widget; /** * Show the live map in a view diff --git a/app/Widgets/LatestNews.php b/app/Widgets/LatestNews.php index de244be1..429b535a 100644 --- a/app/Widgets/LatestNews.php +++ b/app/Widgets/LatestNews.php @@ -2,7 +2,7 @@ namespace App\Widgets; -use App\Interfaces\Widget; +use App\Contracts\Widget; use App\Repositories\NewsRepository; /** diff --git a/app/Widgets/LatestPilots.php b/app/Widgets/LatestPilots.php index bd224ef0..fc1e4c15 100644 --- a/app/Widgets/LatestPilots.php +++ b/app/Widgets/LatestPilots.php @@ -2,7 +2,7 @@ namespace App\Widgets; -use App\Interfaces\Widget; +use App\Contracts\Widget; use App\Repositories\UserRepository; /** diff --git a/app/Widgets/LatestPireps.php b/app/Widgets/LatestPireps.php index 5c3873ac..52c24123 100644 --- a/app/Widgets/LatestPireps.php +++ b/app/Widgets/LatestPireps.php @@ -2,7 +2,7 @@ namespace App\Widgets; -use App\Interfaces\Widget; +use App\Contracts\Widget; use App\Models\Enums\PirepState; use App\Repositories\PirepRepository; diff --git a/app/Widgets/LiveMap.php b/app/Widgets/LiveMap.php index 1b7312c8..514c6a8e 100644 --- a/app/Widgets/LiveMap.php +++ b/app/Widgets/LiveMap.php @@ -2,7 +2,7 @@ namespace App\Widgets; -use App\Interfaces\Widget; +use App\Contracts\Widget; use App\Repositories\AcarsRepository; use App\Services\GeoService; diff --git a/app/Widgets/Weather.php b/app/Widgets/Weather.php index 35ac75b5..45f34dac 100644 --- a/app/Widgets/Weather.php +++ b/app/Widgets/Weather.php @@ -2,7 +2,7 @@ namespace App\Widgets; -use App\Interfaces\Widget; +use App\Contracts\Widget; use App\Support\Metar; /** @@ -22,7 +22,7 @@ class Weather extends Widget public function run() { /** - * @var \App\Interfaces\Metar + * @var \App\Contracts\Metar */ $klass = config('phpvms.metar'); $metar_class = new $klass(); diff --git a/modules/Installer/Http/Controllers/InstallerController.php b/modules/Installer/Http/Controllers/InstallerController.php index 072c427e..37b79684 100644 --- a/modules/Installer/Http/Controllers/InstallerController.php +++ b/modules/Installer/Http/Controllers/InstallerController.php @@ -3,7 +3,7 @@ namespace Modules\Installer\Http\Controllers; use App\Facades\Utils; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Models\User; use App\Repositories\AirlineRepository; use App\Services\AnalyticsService; diff --git a/modules/Installer/Http/Controllers/UpdaterController.php b/modules/Installer/Http/Controllers/UpdaterController.php index d5f80903..851041a7 100644 --- a/modules/Installer/Http/Controllers/UpdaterController.php +++ b/modules/Installer/Http/Controllers/UpdaterController.php @@ -2,7 +2,7 @@ namespace Modules\Installer\Http\Controllers; -use App\Interfaces\Controller; +use App\Contracts\Controller; use App\Services\Installer\MigrationService; use Illuminate\Http\Request; use Log; diff --git a/modules/Installer/Services/ConfigService.php b/modules/Installer/Services/ConfigService.php index 9e0dc9c8..19ce385c 100644 --- a/modules/Installer/Services/ConfigService.php +++ b/modules/Installer/Services/ConfigService.php @@ -2,7 +2,7 @@ namespace Modules\Installer\Services; -use App\Interfaces\Service; +use App\Contracts\Service; use Illuminate\Encryption\Encrypter; use Log; use Nwidart\Modules\Support\Stub; diff --git a/modules/Installer/Services/DatabaseService.php b/modules/Installer/Services/DatabaseService.php index 7d21c255..7794bceb 100644 --- a/modules/Installer/Services/DatabaseService.php +++ b/modules/Installer/Services/DatabaseService.php @@ -2,7 +2,7 @@ namespace Modules\Installer\Services; -use App\Interfaces\Service; +use App\Contracts\Service; use Log; use PDO; diff --git a/modules/Installer/Services/RequirementsService.php b/modules/Installer/Services/RequirementsService.php index 09e92fd8..b997f955 100644 --- a/modules/Installer/Services/RequirementsService.php +++ b/modules/Installer/Services/RequirementsService.php @@ -3,7 +3,7 @@ namespace Modules\Installer\Services; -use App\Interfaces\Service; +use App\Contracts\Service; class RequirementsService extends Service { diff --git a/modules/Sample/Awards/SampleAward.php b/modules/Sample/Awards/SampleAward.php index f31664cf..6c0c3864 100644 --- a/modules/Sample/Awards/SampleAward.php +++ b/modules/Sample/Awards/SampleAward.php @@ -2,7 +2,7 @@ namespace Modules\Sample\Awards; -use App\Interfaces\Award; +use App\Contracts\Award; /** * Class SampleAward diff --git a/modules/Sample/Http/Controllers/Admin/AdminController.php b/modules/Sample/Http/Controllers/Admin/AdminController.php index 7b23b11f..5d02b35a 100644 --- a/modules/Sample/Http/Controllers/Admin/AdminController.php +++ b/modules/Sample/Http/Controllers/Admin/AdminController.php @@ -2,7 +2,7 @@ namespace Modules\Sample\Http\Controllers\Admin; -use App\Interfaces\Controller; +use App\Contracts\Controller; use Illuminate\Http\Request; /** diff --git a/modules/Sample/Http/Controllers/Api/SampleController.php b/modules/Sample/Http/Controllers/Api/SampleController.php index 9e5a28d4..d9565b2f 100644 --- a/modules/Sample/Http/Controllers/Api/SampleController.php +++ b/modules/Sample/Http/Controllers/Api/SampleController.php @@ -2,7 +2,7 @@ namespace Modules\Sample\Http\Controllers\Api; -use App\Interfaces\Controller; +use App\Contracts\Controller; use Illuminate\Http\Request; /** diff --git a/modules/Sample/Http/Controllers/SampleController.php b/modules/Sample/Http/Controllers/SampleController.php index 3745a406..64cd4d5b 100644 --- a/modules/Sample/Http/Controllers/SampleController.php +++ b/modules/Sample/Http/Controllers/SampleController.php @@ -2,7 +2,7 @@ namespace Modules\Sample\Http\Controllers; -use App\Interfaces\Controller; +use App\Contracts\Controller; use Illuminate\Http\Request; /** diff --git a/modules/Sample/Models/SampleTable.php b/modules/Sample/Models/SampleTable.php index 780da808..7b5a48f3 100644 --- a/modules/Sample/Models/SampleTable.php +++ b/modules/Sample/Models/SampleTable.php @@ -2,7 +2,7 @@ namespace Modules\Sample\Models; -use App\Interfaces\Model; +use App\Contracts\Model; /** * Class SampleTable diff --git a/tests/ImporterTest.php b/tests/ImporterTest.php index f9d5331a..38a179a1 100644 --- a/tests/ImporterTest.php +++ b/tests/ImporterTest.php @@ -15,7 +15,7 @@ class ImporterTest extends TestCase public function setUp(): void { parent::setUp(); - $this->importBaseClass = new \App\Interfaces\ImportExport(); + $this->importBaseClass = new \App\Contracts\ImportExport(); $this->importSvc = app(\App\Services\ImportService::class); $this->fareSvc = app(\App\Services\FareService::class); diff --git a/tests/TestCase.php b/tests/TestCase.php index ad28cbd9..f5c98b8d 100755 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -139,7 +139,7 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase $this->transformData($value); } - if (is_subclass_of($value, App\Interfaces\Unit::class)) { + if (is_subclass_of($value, App\Contracts\Unit::class)) { $data[$key] = $value->__toString(); }