diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml old mode 100644 new mode 100755 diff --git a/app/Console/Commands/CheckMigrationsCommand.php b/app/Console/Commands/CheckMigrationsCommand.php index fca8ed6..3ffad1f 100755 --- a/app/Console/Commands/CheckMigrationsCommand.php +++ b/app/Console/Commands/CheckMigrationsCommand.php @@ -123,6 +123,7 @@ class CheckMigrationsCommand extends Command $this->warn("[Orphaned] {$file->getFilename()} modifies table `{$table}` which no longer exists."); $this->warnings++; $this->addFileToDelete($file->getFilename()); + continue; } diff --git a/app/Filament/Pages/Monitoring/Commandocentrum.php b/app/Filament/Pages/Monitoring/Commandocentrum.php index 3e438aa..1e913e2 100755 --- a/app/Filament/Pages/Monitoring/Commandocentrum.php +++ b/app/Filament/Pages/Monitoring/Commandocentrum.php @@ -18,7 +18,6 @@ use App\Services\RconService; use App\Services\SettingsService; use App\Services\UpdateHistoryService; use BackedEnum; -use Carbon\Carbon; use Exception; use Filament\Actions\Action; use Filament\Forms\Components\Placeholder; @@ -31,6 +30,7 @@ use Filament\Notifications\Notification; use Filament\Pages\Page; use Filament\Schemas\Components\Section; use Filament\Schemas\Schema; +use Illuminate\Contracts\View\View; use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\DB; @@ -67,7 +67,7 @@ final class Commandocentrum extends Page implements HasForms public string $catalogSyncUrl = ''; - /** @var array<\App\Services\Diagnostics\DiagnosticResult> */ + /** @var array */ public array $diagnostics = []; public function mount(): void @@ -421,7 +421,7 @@ final class Commandocentrum extends Page implements HasForms ]); } - private function renderServerInfoView(): \Illuminate\Contracts\View\View + private function renderServerInfoView(): View { $load = sys_getloadavg(); @@ -438,7 +438,7 @@ final class Commandocentrum extends Page implements HasForms ]); } - private function renderHotelStatusView(): \Illuminate\Contracts\View\View + private function renderHotelStatusView(): View { $serviceName = $this->getSetting('emulator_service_name', 'emulator'); $serviceStatus = $this->runCommand('systemctl is-active ' . escapeshellarg($serviceName) . ' 2>/dev/null') ?: 'inactive'; @@ -479,7 +479,7 @@ final class Commandocentrum extends Page implements HasForms ]); } - private function renderEmulatorInfoView(): \Illuminate\Contracts\View\View + private function renderEmulatorInfoView(): View { $status = $this->getEmulatorStatusText(); @@ -491,7 +491,7 @@ final class Commandocentrum extends Page implements HasForms ]); } - private function renderEmulatorSettingsView(): \Illuminate\Contracts\View\View + private function renderEmulatorSettingsView(): View { return view('filament.components.commandocentrum.emulator-settings', [ 'emulatorBranchesHtml' => $this->getEmulatorBranchesHtml(), @@ -499,7 +499,7 @@ final class Commandocentrum extends Page implements HasForms ]); } - private function renderEmulatorStatusView(): \Illuminate\Contracts\View\View + private function renderEmulatorStatusView(): View { $serviceName = $this->getSetting('emulator_service_name', 'arcturus'); $jarPath = $this->getSetting('emulator_jar_path', '/var/www/Emulator'); @@ -540,7 +540,7 @@ final class Commandocentrum extends Page implements HasForms ]); } - private function renderNitroSettingsView(): \Illuminate\Contracts\View\View + private function renderNitroSettingsView(): View { return view('filament.components.commandocentrum.nitro-settings', [ 'nitroBranchesHtml' => $this->getNitroBranchesHtml(), @@ -548,7 +548,7 @@ final class Commandocentrum extends Page implements HasForms ]); } - private function renderNitroStatusView(): \Illuminate\Contracts\View\View + private function renderNitroStatusView(): View { $clientPath = $this->getSetting('nitro_client_path', '/var/www/nitro-client'); $rendererPath = $this->getSetting('nitro_renderer_path', '/var/www/nitro-renderer'); @@ -572,7 +572,7 @@ final class Commandocentrum extends Page implements HasForms ]); } - private function renderBackupsListView(): \Illuminate\Contracts\View\View + private function renderBackupsListView(): View { try { $backups = app(EmulatorControlAction::class)->getBackups(); @@ -585,7 +585,7 @@ final class Commandocentrum extends Page implements HasForms ]); } - private function renderClothingStatusView(): \Illuminate\Contracts\View\View + private function renderClothingStatusView(): View { try { $count = DB::table('catalog_clothing')->count(); @@ -598,7 +598,7 @@ final class Commandocentrum extends Page implements HasForms ]); } - private function renderStaffActivityView(): \Illuminate\Contracts\View\View + private function renderStaffActivityView(): View { try { $activities = StaffActivity::with('user:id,username,look') @@ -614,7 +614,7 @@ final class Commandocentrum extends Page implements HasForms ]); } - private function renderUpdateHistoryView(): \Illuminate\Contracts\View\View + private function renderUpdateHistoryView(): View { try { $history = app(UpdateHistoryService::class)->getRecent(10); diff --git a/app/Http/Controllers/Api/AuthController.php b/app/Http/Controllers/Api/AuthController.php index 5c793b2..396ba68 100755 --- a/app/Http/Controllers/Api/AuthController.php +++ b/app/Http/Controllers/Api/AuthController.php @@ -18,6 +18,7 @@ use App\Models\Articles\WebsiteArticle; use App\Models\Miscellaneous\CameraWeb; use App\Models\User; use Illuminate\Http\JsonResponse; +use Illuminate\Http\Request; use Illuminate\Support\Facades\Hash; use Illuminate\Validation\ValidationException; @@ -70,12 +71,12 @@ class AuthController extends Controller ], 201); } - public function user(\Illuminate\Http\Request $request): JsonResponse + public function user(Request $request): JsonResponse { return response()->json(new UserApiResource($request->user())); } - public function logout(\Illuminate\Http\Request $request): JsonResponse + public function logout(Request $request): JsonResponse { $request->user()->currentAccessToken()->delete(); diff --git a/app/Http/Controllers/Api/FurniEditorController.php b/app/Http/Controllers/Api/FurniEditorController.php index 1d2b6e2..92a9009 100755 --- a/app/Http/Controllers/Api/FurniEditorController.php +++ b/app/Http/Controllers/Api/FurniEditorController.php @@ -279,6 +279,7 @@ class FurniEditorController extends Controller /** * @param array $data + * * @return array */ private function buildUpdateData(array $data): array @@ -323,6 +324,7 @@ class FurniEditorController extends Controller /** * @param array $data + * * @return array */ private function buildInsertData(array $data): array diff --git a/app/Http/Controllers/Api/HotelApiController.php b/app/Http/Controllers/Api/HotelApiController.php index 6baae4a..2ceb1f8 100755 --- a/app/Http/Controllers/Api/HotelApiController.php +++ b/app/Http/Controllers/Api/HotelApiController.php @@ -13,8 +13,6 @@ use App\Http\Resources\Api\HelpTicketResource; use App\Http\Resources\Api\LeaderboardUserResource; use App\Http\Resources\Api\PhotoResource; use App\Http\Resources\Api\ShopPackageResource; -use App\Http\Resources\Api\UserApiResource; -use App\Http\Resources\Api\UserBriefResource; use App\Models\Articles\WebsiteArticle; use App\Models\Game\Furniture\CatalogItem; use App\Models\Game\Furniture\CatalogPage; diff --git a/app/Http/Controllers/Community/LeaderboardController.php b/app/Http/Controllers/Community/LeaderboardController.php index 16f0f66..67554cc 100755 --- a/app/Http/Controllers/Community/LeaderboardController.php +++ b/app/Http/Controllers/Community/LeaderboardController.php @@ -7,6 +7,7 @@ use App\Models\Game\Player\UserCurrency; use App\Models\Game\Player\UserSetting; use App\Models\User; use App\Services\Community\StaffService; +use Illuminate\Database\Eloquent\Collection; use Illuminate\Support\Facades\Cache; use Illuminate\View\View; @@ -60,7 +61,7 @@ class LeaderboardController extends Controller ]); } - private function retrieveSettings(string $column): \Illuminate\Database\Eloquent\Collection + private function retrieveSettings(string $column): Collection { return UserSetting::query() ->select(['user_id', $column]) diff --git a/app/Http/Controllers/Community/RadioController.php b/app/Http/Controllers/Community/RadioController.php index 167e991..ad87222 100755 --- a/app/Http/Controllers/Community/RadioController.php +++ b/app/Http/Controllers/Community/RadioController.php @@ -302,6 +302,7 @@ class RadioController extends Controller /** * @param array $keys + * * @return array */ private function getSettings(array $keys): array diff --git a/app/Http/Controllers/Shop/PayPalController.php b/app/Http/Controllers/Shop/PayPalController.php index b8f439d..771c50f 100755 --- a/app/Http/Controllers/Shop/PayPalController.php +++ b/app/Http/Controllers/Shop/PayPalController.php @@ -4,7 +4,6 @@ namespace App\Http\Controllers\Shop; use App\Http\Controllers\Controller; use App\Http\Requests\AccountTopupFormRequest; -use App\Models\Shop\WebsitePaypalTransaction; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Support\Facades\Log; diff --git a/app/Models/Community/RareValue/WebsiteRareValue.php b/app/Models/Community/RareValue/WebsiteRareValue.php index 657c1a7..e893a56 100755 --- a/app/Models/Community/RareValue/WebsiteRareValue.php +++ b/app/Models/Community/RareValue/WebsiteRareValue.php @@ -23,6 +23,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; class WebsiteRareValue extends Model { use HasFactory; + #[\Override] protected $guarded = ['id', 'created_at', 'updated_at']; diff --git a/app/Models/Community/RareValue/WebsiteRareValueCategory.php b/app/Models/Community/RareValue/WebsiteRareValueCategory.php index 6715412..69483f1 100755 --- a/app/Models/Community/RareValue/WebsiteRareValueCategory.php +++ b/app/Models/Community/RareValue/WebsiteRareValueCategory.php @@ -27,6 +27,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany; class WebsiteRareValueCategory extends Model { use HasFactory; + #[\Override] protected $guarded = ['id', 'created_at', 'updated_at']; diff --git a/app/Models/Community/Staff/WebsiteStaffApplications.php b/app/Models/Community/Staff/WebsiteStaffApplications.php index af0c23b..4e415de 100755 --- a/app/Models/Community/Staff/WebsiteStaffApplications.php +++ b/app/Models/Community/Staff/WebsiteStaffApplications.php @@ -16,6 +16,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; class WebsiteStaffApplications extends Model { use HasFactory; + #[\Override] protected $table = 'website_staff_applications'; diff --git a/app/Models/Community/Teams/WebsiteTeam.php b/app/Models/Community/Teams/WebsiteTeam.php index bd1ffe2..5a0cc9f 100755 --- a/app/Models/Community/Teams/WebsiteTeam.php +++ b/app/Models/Community/Teams/WebsiteTeam.php @@ -18,6 +18,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany; class WebsiteTeam extends Model { use HasFactory; + #[\Override] protected $table = 'website_teams'; diff --git a/app/Models/Game/Player/UserBadge.php b/app/Models/Game/Player/UserBadge.php index 4e81a13..09368f1 100755 --- a/app/Models/Game/Player/UserBadge.php +++ b/app/Models/Game/Player/UserBadge.php @@ -10,6 +10,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; class UserBadge extends Model { use HasFactory; + #[\Override] protected $table = 'users_badges'; diff --git a/app/Models/Game/Player/UserCurrency.php b/app/Models/Game/Player/UserCurrency.php index 336858a..666c472 100755 --- a/app/Models/Game/Player/UserCurrency.php +++ b/app/Models/Game/Player/UserCurrency.php @@ -13,6 +13,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; class UserCurrency extends Model { use HasFactory; + #[\Override] protected $guarded = ['user_id', 'type']; diff --git a/app/Models/Help/WebsiteHelpCenterCategory.php b/app/Models/Help/WebsiteHelpCenterCategory.php index 24bb835..e67fa58 100755 --- a/app/Models/Help/WebsiteHelpCenterCategory.php +++ b/app/Models/Help/WebsiteHelpCenterCategory.php @@ -14,6 +14,7 @@ use Illuminate\Database\Eloquent\Model; class WebsiteHelpCenterCategory extends Model { use HasFactory; + #[\Override] protected $guarded = ['id', 'created_at', 'updated_at', 'name', 'icon']; diff --git a/app/Models/Help/WebsiteHelpCenterQuestion.php b/app/Models/Help/WebsiteHelpCenterQuestion.php index 4246e3d..46d45c5 100755 --- a/app/Models/Help/WebsiteHelpCenterQuestion.php +++ b/app/Models/Help/WebsiteHelpCenterQuestion.php @@ -10,6 +10,7 @@ use Illuminate\Database\Eloquent\Model; class WebsiteHelpCenterQuestion extends Model { use HasFactory; + #[\Override] protected $table = 'help_questions'; diff --git a/app/Models/Help/WebsiteHelpCenterTicketReply.php b/app/Models/Help/WebsiteHelpCenterTicketReply.php index 7537da9..383a081 100755 --- a/app/Models/Help/WebsiteHelpCenterTicketReply.php +++ b/app/Models/Help/WebsiteHelpCenterTicketReply.php @@ -24,6 +24,7 @@ use Stevebauman\Purify\Facades\Purify; class WebsiteHelpCenterTicketReply extends Model { use HasFactory; + #[\Override] protected $guarded = ['id', 'created_at', 'updated_at', 'user_id', 'ticket_id', 'content']; diff --git a/app/Models/Help/WebsiteRule.php b/app/Models/Help/WebsiteRule.php index 755c370..96a55c6 100755 --- a/app/Models/Help/WebsiteRule.php +++ b/app/Models/Help/WebsiteRule.php @@ -9,6 +9,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; class WebsiteRule extends Model { use HasFactory; + #[\Override] protected $guarded = ['id', 'category_id', 'created_at', 'updated_at']; diff --git a/app/Models/Help/WebsiteRuleCategory.php b/app/Models/Help/WebsiteRuleCategory.php index 0e3dc10..fb4a193 100755 --- a/app/Models/Help/WebsiteRuleCategory.php +++ b/app/Models/Help/WebsiteRuleCategory.php @@ -9,6 +9,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany; class WebsiteRuleCategory extends Model { use HasFactory; + #[\Override] protected $guarded = ['id', 'created_at', 'updated_at']; diff --git a/app/Models/Shop/WebsiteShopArticleFeature.php b/app/Models/Shop/WebsiteShopArticleFeature.php index ba91c93..d7519b9 100755 --- a/app/Models/Shop/WebsiteShopArticleFeature.php +++ b/app/Models/Shop/WebsiteShopArticleFeature.php @@ -9,6 +9,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; class WebsiteShopArticleFeature extends Model { use HasFactory; + #[\Override] protected $guarded = ['id', 'created_at', 'updated_at', 'article_id', 'feature']; diff --git a/app/Models/Shop/WebsiteShopVoucher.php b/app/Models/Shop/WebsiteShopVoucher.php index d16adb4..ecdf87a 100755 --- a/app/Models/Shop/WebsiteShopVoucher.php +++ b/app/Models/Shop/WebsiteShopVoucher.php @@ -14,6 +14,7 @@ use Illuminate\Database\Eloquent\Model; class WebsiteShopVoucher extends Model { use HasFactory; + #[\Override] protected $guarded = ['id', 'created_at', 'updated_at', 'code', 'amount', 'max_uses', 'expires_at']; diff --git a/app/Models/Shop/WebsiteUsedShopVoucher.php b/app/Models/Shop/WebsiteUsedShopVoucher.php index 458d265..47923cc 100755 --- a/app/Models/Shop/WebsiteUsedShopVoucher.php +++ b/app/Models/Shop/WebsiteUsedShopVoucher.php @@ -9,6 +9,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany; class WebsiteUsedShopVoucher extends Model { use HasFactory; + #[\Override] protected $guarded = ['id', 'created_at', 'updated_at', 'user_id', 'voucher_id']; diff --git a/app/Models/User/Referral.php b/app/Models/User/Referral.php index 3236e10..1add944 100755 --- a/app/Models/User/Referral.php +++ b/app/Models/User/Referral.php @@ -10,6 +10,7 @@ use Illuminate\Database\Eloquent\Model; class Referral extends Model { use HasFactory; + #[\Override] protected $guarded = ['id', 'created_at', 'updated_at', 'user_id', 'referrer_id']; } diff --git a/app/Models/User/WebsiteUserGuestbook.php b/app/Models/User/WebsiteUserGuestbook.php index e34bfa1..e9ebec3 100755 --- a/app/Models/User/WebsiteUserGuestbook.php +++ b/app/Models/User/WebsiteUserGuestbook.php @@ -10,6 +10,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; class WebsiteUserGuestbook extends Model { use HasFactory; + #[\Override] protected $guarded = ['id', 'created_at', 'updated_at', 'user_id', 'profile_id']; diff --git a/app/Services/Community/RadioScheduleService.php b/app/Services/Community/RadioScheduleService.php index abe7979..177b4dc 100755 --- a/app/Services/Community/RadioScheduleService.php +++ b/app/Services/Community/RadioScheduleService.php @@ -4,6 +4,7 @@ namespace App\Services\Community; use App\Models\RadioSchedule; use App\Models\User; +use Illuminate\Support\Collection; use Illuminate\Support\Facades\Cache; class RadioScheduleService @@ -53,7 +54,7 @@ class RadioScheduleService ->get()); } - public function getFullSchedule(): \Illuminate\Support\Collection + public function getFullSchedule(): Collection { return Cache::remember('radio_schedule_all', 300, fn () => RadioSchedule::with('user:id,username,look') ->active() diff --git a/app/Services/Diagnostics/DatabaseDiagnostic.php b/app/Services/Diagnostics/DatabaseDiagnostic.php index 96ef753..8c85a8f 100755 --- a/app/Services/Diagnostics/DatabaseDiagnostic.php +++ b/app/Services/Diagnostics/DatabaseDiagnostic.php @@ -70,7 +70,7 @@ class DatabaseDiagnostic return DiagnosticResult::error( 'Required Tables', 'Missing: ' . implode(', ', $missing), - 'Run: php artisan migrate' + 'Run: php artisan migrate', ); } @@ -95,7 +95,7 @@ class DatabaseDiagnostic return DiagnosticResult::warning( 'Radio Tables', 'Missing: ' . implode(', ', $missing), - 'Run radio migration seeder' + 'Run radio migration seeder', ); } diff --git a/app/Services/Diagnostics/DiagnosticRunner.php b/app/Services/Diagnostics/DiagnosticRunner.php index b9ec77c..45fc4d3 100755 --- a/app/Services/Diagnostics/DiagnosticRunner.php +++ b/app/Services/Diagnostics/DiagnosticRunner.php @@ -17,10 +17,10 @@ class DiagnosticRunner $this->results = []; $diagnostics = [ - new DatabaseDiagnostic(), - new SecurityDiagnostic(), - new SystemDiagnostic(), - new HttpDiagnostic(), + new DatabaseDiagnostic, + new SecurityDiagnostic, + new SystemDiagnostic, + new HttpDiagnostic, ]; foreach ($diagnostics as $diagnostic) { diff --git a/app/Services/Diagnostics/HttpDiagnostic.php b/app/Services/Diagnostics/HttpDiagnostic.php index 33a0dd7..12f0bb6 100755 --- a/app/Services/Diagnostics/HttpDiagnostic.php +++ b/app/Services/Diagnostics/HttpDiagnostic.php @@ -26,7 +26,7 @@ class HttpDiagnostic return DiagnosticResult::warning( 'App URL', 'APP_URL not configured properly', - 'Set APP_URL in .env to your domain' + 'Set APP_URL in .env to your domain', ); } @@ -34,7 +34,7 @@ class HttpDiagnostic return DiagnosticResult::warning( 'App URL', 'Not using HTTPS in production', - 'Configure SSL and update APP_URL' + 'Configure SSL and update APP_URL', ); } @@ -87,7 +87,7 @@ class HttpDiagnostic return DiagnosticResult::warning( 'HTTP Redirect', "HTTP returns {$response->status()} instead of redirect", - 'Configure web server to redirect HTTP to HTTPS' + 'Configure web server to redirect HTTP to HTTPS', ); } catch (\Exception $e) { return DiagnosticResult::warning('HTTP Redirect', 'Could not test: ' . $e->getMessage()); diff --git a/app/Services/Diagnostics/SecurityDiagnostic.php b/app/Services/Diagnostics/SecurityDiagnostic.php index d50ef7b..554cb26 100755 --- a/app/Services/Diagnostics/SecurityDiagnostic.php +++ b/app/Services/Diagnostics/SecurityDiagnostic.php @@ -36,7 +36,7 @@ class SecurityDiagnostic return DiagnosticResult::error( 'Debug Mode', 'Debug mode is enabled in production', - 'Set APP_DEBUG=false in .env' + 'Set APP_DEBUG=false in .env', ); } @@ -56,7 +56,7 @@ class SecurityDiagnostic return DiagnosticResult::warning( '.env File', 'File appears to be on a single line', - 'Ensure .env has proper line breaks' + 'Ensure .env has proper line breaks', ); } @@ -81,7 +81,7 @@ class SecurityDiagnostic return DiagnosticResult::error( 'File Permissions', 'Not writable: ' . implode(', ', $issues), - 'Run: chmod -R 775 storage bootstrap/cache' + 'Run: chmod -R 775 storage bootstrap/cache', ); } diff --git a/app/Services/Diagnostics/SystemDiagnostic.php b/app/Services/Diagnostics/SystemDiagnostic.php index e28a43a..a3ce73f 100755 --- a/app/Services/Diagnostics/SystemDiagnostic.php +++ b/app/Services/Diagnostics/SystemDiagnostic.php @@ -30,7 +30,7 @@ class SystemDiagnostic return DiagnosticResult::error( 'PHP Extensions', 'Missing: ' . implode(', ', $missing), - 'Install: sudo apt install php-' . implode(' php-', $missing) + 'Install: sudo apt install php-' . implode(' php-', $missing), ); } @@ -46,7 +46,7 @@ class SystemDiagnostic return DiagnosticResult::error( 'PHP Version', 'Current: ' . PHP_VERSION . ' (minimum: 8.1)', - 'Upgrade PHP to 8.1 or higher' + 'Upgrade PHP to 8.1 or higher', ); } @@ -77,7 +77,7 @@ class SystemDiagnostic return DiagnosticResult::warning( 'Session', 'Using file sessions in production', - 'Consider using redis or database sessions' + 'Consider using redis or database sessions', ); } diff --git a/app/Services/Emulator/EmulatorBuildService.php b/app/Services/Emulator/EmulatorBuildService.php index f518061..b279cca 100755 --- a/app/Services/Emulator/EmulatorBuildService.php +++ b/app/Services/Emulator/EmulatorBuildService.php @@ -4,7 +4,6 @@ declare(strict_types=1); namespace App\Services\Emulator; -use App\Services\Emulator\EmulatorSqlService; use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Process; diff --git a/app/Services/Emulator/EmulatorJarService.php b/app/Services/Emulator/EmulatorJarService.php index 6318905..a64002c 100755 --- a/app/Services/Emulator/EmulatorJarService.php +++ b/app/Services/Emulator/EmulatorJarService.php @@ -4,7 +4,6 @@ declare(strict_types=1); namespace App\Services\Emulator; -use App\Services\Emulator\EmulatorSourceService; use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Process; diff --git a/app/Services/EmulatorUpdateService.php b/app/Services/EmulatorUpdateService.php index 569082f..81376ad 100755 --- a/app/Services/EmulatorUpdateService.php +++ b/app/Services/EmulatorUpdateService.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace App\Services; +use App\Models\Miscellaneous\WebsiteSetting; use App\Services\Emulator\EmulatorBackupService; use App\Services\Emulator\EmulatorBuildService; use App\Services\Emulator\EmulatorJarService; @@ -17,11 +18,17 @@ use Illuminate\Support\Facades\Process; class EmulatorUpdateService { private readonly EmulatorStatusService $statusService; + private readonly EmulatorJarService $jarService; + private readonly EmulatorSourceService $sourceService; + private readonly EmulatorBuildService $buildService; + private readonly EmulatorSqlService $sqlService; + private readonly EmulatorBackupService $backupService; + private readonly SettingsService $settings; public function __construct() @@ -217,9 +224,9 @@ class EmulatorUpdateService public function resetInstalledDate(): void { - \App\Models\Miscellaneous\WebsiteSetting::where('key', 'emulator_jar_installed_date')->delete(); - \App\Models\Miscellaneous\WebsiteSetting::where('key', 'emulator_source_commit')->delete(); - \App\Models\Miscellaneous\WebsiteSetting::where('key', 'emulator_source_date')->delete(); + WebsiteSetting::where('key', 'emulator_jar_installed_date')->delete(); + WebsiteSetting::where('key', 'emulator_source_commit')->delete(); + WebsiteSetting::where('key', 'emulator_source_date')->delete(); } public function clearAllLogs(): array diff --git a/database/factories/Shop/WebsitePaypalTransactionFactory.php b/database/factories/Shop/WebsitePaypalTransactionFactory.php old mode 100644 new mode 100755 diff --git a/database/factories/User/ClaimedReferralLogFactory.php b/database/factories/User/ClaimedReferralLogFactory.php old mode 100644 new mode 100755 diff --git a/database/factories/User/UserOrderFactory.php b/database/factories/User/UserOrderFactory.php old mode 100644 new mode 100755 diff --git a/routes/auth.php b/routes/auth.php index d18f9fe..0b961f9 100755 --- a/routes/auth.php +++ b/routes/auth.php @@ -1,14 +1,14 @@ group(function () {