From dc418a51a11afdb7f0b67a3e89b2d6eb96d38ce2 Mon Sep 17 00:00:00 2001 From: Remco Date: Wed, 7 Jan 2026 19:35:41 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=86=99=20Fix=20laravel=20pint=20spaces=20?= =?UTF-8?q?=F0=9F=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Actions/Fortify/RedirectIfTwoFactorAuthenticatable.php | 1 - Updated_Cms/app/Helpers/helper.php | 5 +++-- .../app/Http/Controllers/User/ForgotPasswordController.php | 1 - Updated_Cms/app/Http/Middleware/LocalizationMiddleware.php | 7 +++---- Updated_Cms/app/Models/Article.php | 1 + Updated_Cms/app/Models/CommandLog.php | 1 + .../app/Models/Community/Staff/WebsiteOpenPosition.php | 1 + Updated_Cms/app/Models/Help/WebsiteHelpCenterTicket.php | 2 +- .../app/Models/Help/WebsiteHelpCenterTicketReply.php | 2 +- Updated_Cms/app/Models/Miscellaneous/CameraWeb.php | 2 +- Updated_Cms/app/Models/PasswordResetToken.php | 1 + Updated_Cms/app/Models/WebsiteAd.php | 1 + Updated_Cms/app/Services/User/SessionService.php | 1 - 13 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Updated_Cms/app/Actions/Fortify/RedirectIfTwoFactorAuthenticatable.php b/Updated_Cms/app/Actions/Fortify/RedirectIfTwoFactorAuthenticatable.php index 17837dd031..72641877b7 100644 --- a/Updated_Cms/app/Actions/Fortify/RedirectIfTwoFactorAuthenticatable.php +++ b/Updated_Cms/app/Actions/Fortify/RedirectIfTwoFactorAuthenticatable.php @@ -11,7 +11,6 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Validator; use Illuminate\Validation\ValidationException; -use Laravel\Fortify\Events\TwoFactorAuthenticationChallenged; use Laravel\Fortify\Fortify; use Laravel\Fortify\LoginRateLimiter; use Laravel\Fortify\TwoFactorAuthenticatable; diff --git a/Updated_Cms/app/Helpers/helper.php b/Updated_Cms/app/Helpers/helper.php index 19eafa0662..44789eeef6 100644 --- a/Updated_Cms/app/Helpers/helper.php +++ b/Updated_Cms/app/Helpers/helper.php @@ -3,8 +3,8 @@ use App\Services\HousekeepingPermissionsService; use App\Services\PermissionsService; use App\Services\SettingsService; -use Illuminate\Support\Str; use Illuminate\Support\Facades\Schema; +use Illuminate\Support\Str; if (! function_exists('setting')) { function setting(string $setting): string @@ -43,6 +43,7 @@ if (! function_exists('findMigration')) { return basename($filename); } } + return ''; } } @@ -73,4 +74,4 @@ if (! function_exists('dropForeignKeyIfExists')) { } } } -} \ No newline at end of file +} diff --git a/Updated_Cms/app/Http/Controllers/User/ForgotPasswordController.php b/Updated_Cms/app/Http/Controllers/User/ForgotPasswordController.php index 098f900eb3..8f41c6981c 100644 --- a/Updated_Cms/app/Http/Controllers/User/ForgotPasswordController.php +++ b/Updated_Cms/app/Http/Controllers/User/ForgotPasswordController.php @@ -5,7 +5,6 @@ namespace App\Http\Controllers\User; use App\Http\Controllers\Controller; use App\Models\PasswordResetToken; use App\Models\User; -use Carbon\Carbon; use Illuminate\Http\Request; use Illuminate\Support\Str; use Mail; diff --git a/Updated_Cms/app/Http/Middleware/LocalizationMiddleware.php b/Updated_Cms/app/Http/Middleware/LocalizationMiddleware.php index 66e89a30ac..07571b7b2f 100644 --- a/Updated_Cms/app/Http/Middleware/LocalizationMiddleware.php +++ b/Updated_Cms/app/Http/Middleware/LocalizationMiddleware.php @@ -24,10 +24,9 @@ class LocalizationMiddleware $countryCode = config('habbo.site.default_language'); // GEWIJZIGD: isset() werkt niet op Request::server() in PHP 8. Gebruik null !== in plaats daarvan. - if (null !== \Illuminate\Support\Facades\Request::server('HTTP_CF_IPCOUNTRY')) { + if (\Illuminate\Support\Facades\Request::server('HTTP_CF_IPCOUNTRY') !== null) { $countryCode = strtolower((string) \Illuminate\Support\Facades\Request::server('HTTP_CF_IPCOUNTRY')); - } - elseif (null !== \Illuminate\Support\Facades\Request::server('HTTP_ACCEPT_LANGUAGE')) { + } elseif (\Illuminate\Support\Facades\Request::server('HTTP_ACCEPT_LANGUAGE') !== null) { $countryCode = strtolower(substr((string) \Illuminate\Support\Facades\Request::server('HTTP_ACCEPT_LANGUAGE'), 0, 2)); } @@ -47,4 +46,4 @@ class LocalizationMiddleware return $next($request); } -} \ No newline at end of file +} diff --git a/Updated_Cms/app/Models/Article.php b/Updated_Cms/app/Models/Article.php index 85d29c6a56..39edfef0f1 100644 --- a/Updated_Cms/app/Models/Article.php +++ b/Updated_Cms/app/Models/Article.php @@ -134,6 +134,7 @@ class Article extends Model ->each(fn (AuthorNotification $follower) => $follower->user->notify($this->user, NotificationType::ArticlePosted, $this->getNotificationUrl()), ); } + protected function casts(): array { return [ diff --git a/Updated_Cms/app/Models/CommandLog.php b/Updated_Cms/app/Models/CommandLog.php index 80373b49b3..0e9866f79f 100644 --- a/Updated_Cms/app/Models/CommandLog.php +++ b/Updated_Cms/app/Models/CommandLog.php @@ -22,6 +22,7 @@ class CommandLog extends Model { return $this->belongsTo(User::class); } + protected function casts(): array { return [ diff --git a/Updated_Cms/app/Models/Community/Staff/WebsiteOpenPosition.php b/Updated_Cms/app/Models/Community/Staff/WebsiteOpenPosition.php index 873cd21123..41af0f8a86 100644 --- a/Updated_Cms/app/Models/Community/Staff/WebsiteOpenPosition.php +++ b/Updated_Cms/app/Models/Community/Staff/WebsiteOpenPosition.php @@ -45,6 +45,7 @@ class WebsiteOpenPosition extends Model { return $query->where('apply_from', '<=', now())->where('apply_to', '>', now()); } + protected function casts(): array { return [ diff --git a/Updated_Cms/app/Models/Help/WebsiteHelpCenterTicket.php b/Updated_Cms/app/Models/Help/WebsiteHelpCenterTicket.php index bc6e793b87..40461e3cac 100644 --- a/Updated_Cms/app/Models/Help/WebsiteHelpCenterTicket.php +++ b/Updated_Cms/app/Models/Help/WebsiteHelpCenterTicket.php @@ -52,6 +52,6 @@ class WebsiteHelpCenterTicket extends Model protected function content(): \Illuminate\Database\Eloquent\Casts\Attribute { - return \Illuminate\Database\Eloquent\Casts\Attribute::make(get: fn($value) => Purify::clean($value)); + return \Illuminate\Database\Eloquent\Casts\Attribute::make(get: fn ($value) => Purify::clean($value)); } } diff --git a/Updated_Cms/app/Models/Help/WebsiteHelpCenterTicketReply.php b/Updated_Cms/app/Models/Help/WebsiteHelpCenterTicketReply.php index 61cedf8cff..5a8a32dad3 100644 --- a/Updated_Cms/app/Models/Help/WebsiteHelpCenterTicketReply.php +++ b/Updated_Cms/app/Models/Help/WebsiteHelpCenterTicketReply.php @@ -29,6 +29,6 @@ class WebsiteHelpCenterTicketReply extends Model protected function content(): \Illuminate\Database\Eloquent\Casts\Attribute { - return \Illuminate\Database\Eloquent\Casts\Attribute::make(get: fn($value) => Purify::clean($value)); + return \Illuminate\Database\Eloquent\Casts\Attribute::make(get: fn ($value) => Purify::clean($value)); } } diff --git a/Updated_Cms/app/Models/Miscellaneous/CameraWeb.php b/Updated_Cms/app/Models/Miscellaneous/CameraWeb.php index 8545804f39..30717c6f11 100644 --- a/Updated_Cms/app/Models/Miscellaneous/CameraWeb.php +++ b/Updated_Cms/app/Models/Miscellaneous/CameraWeb.php @@ -4,7 +4,6 @@ namespace App\Models\Miscellaneous; use App\Models\Room; use App\Models\User; -use Carbon\Carbon; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Model; @@ -61,6 +60,7 @@ class CameraWeb extends Model get: fn () => \Illuminate\Support\Facades\Date::parse($this->timestamp)->format('Y-m-d H:i'), ); } + protected function casts(): array { return [ diff --git a/Updated_Cms/app/Models/PasswordResetToken.php b/Updated_Cms/app/Models/PasswordResetToken.php index 790babcef6..5f787dcfed 100644 --- a/Updated_Cms/app/Models/PasswordResetToken.php +++ b/Updated_Cms/app/Models/PasswordResetToken.php @@ -18,6 +18,7 @@ class PasswordResetToken extends Model { return $this->belongsTo(User::class, 'email', 'mail'); } + protected function casts(): array { return [ diff --git a/Updated_Cms/app/Models/WebsiteAd.php b/Updated_Cms/app/Models/WebsiteAd.php index 9d7c49f724..578528c39e 100644 --- a/Updated_Cms/app/Models/WebsiteAd.php +++ b/Updated_Cms/app/Models/WebsiteAd.php @@ -25,6 +25,7 @@ class WebsiteAd extends Model if (! str_starts_with((string) $adsPicturePath, 'http')) { $adsPicturePath = rtrim((string) config('app.url'), '/') . '/' . ltrim((string) $adsPicturePath, '/'); } + return rtrim((string) $adsPicturePath, '/') . '/' . $this->image; }); } diff --git a/Updated_Cms/app/Services/User/SessionService.php b/Updated_Cms/app/Services/User/SessionService.php index 9058fc56ee..fe5153ceaa 100644 --- a/Updated_Cms/app/Services/User/SessionService.php +++ b/Updated_Cms/app/Services/User/SessionService.php @@ -2,7 +2,6 @@ namespace App\Services\User; -use Carbon\Carbon; use Illuminate\Http\Request; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Auth;