diff --git a/Updated_Cms/app/Models/PasswordResetToken.php b/Updated_Cms/app/Models/PasswordResetToken.php index 790babcef6..f391e0fab5 100644 --- a/Updated_Cms/app/Models/PasswordResetToken.php +++ b/Updated_Cms/app/Models/PasswordResetToken.php @@ -14,6 +14,9 @@ class PasswordResetToken extends Model // timestamps = true, but we don't have "UPDATED_AT". To prevent an error, we set the default value to `null`. public const UPDATED_AT = null; + /** + * @return BelongsTo + */ public function user(): BelongsTo { return $this->belongsTo(User::class, 'email', 'mail'); diff --git a/Updated_Cms/app/Models/Room.php b/Updated_Cms/app/Models/Room.php index 4442538d23..3a287fd3f7 100644 --- a/Updated_Cms/app/Models/Room.php +++ b/Updated_Cms/app/Models/Room.php @@ -2,7 +2,7 @@ namespace App\Models; -use App\Models\User\UserItem; +use App\Models\Game\Furniture\Item; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; @@ -10,20 +10,24 @@ use Illuminate\Database\Eloquent\Relations\HasMany; class Room extends Model { - use HasFactory; - protected $guarded = []; public $timestamps = false; + /** + * @return BelongsTo + */ public function user(): BelongsTo { return $this->belongsTo(User::class, 'owner_id'); } + /** + * @return HasMany + */ public function items(): HasMany { - return $this->hasMany(UserItem::class); + return $this->hasMany(Item::class); } public function replicateForUser(User $user): self diff --git a/Updated_Cms/app/Models/Shop/WebsiteShopArticle.php b/Updated_Cms/app/Models/Shop/WebsiteShopArticle.php index 4a9088c1fd..8ca8a74c83 100644 --- a/Updated_Cms/app/Models/Shop/WebsiteShopArticle.php +++ b/Updated_Cms/app/Models/Shop/WebsiteShopArticle.php @@ -19,13 +19,13 @@ class WebsiteShopArticle extends Model public function furniItems(): Collection { if (! $this->furniture) { - return collect(); + return new Collection(); } $furniture = json_decode($this->furniture, true); if (! is_array($furniture)) { - return collect(); + return new Collection(); } $furnitureIds = array_column($furniture, 'item_id'); diff --git a/Updated_Cms/app/Models/User.php b/Updated_Cms/app/Models/User.php index aba66bd598..3be7a67182 100644 --- a/Updated_Cms/app/Models/User.php +++ b/Updated_Cms/app/Models/User.php @@ -365,8 +365,14 @@ class User extends Authenticatable implements FilamentUser, HasName return false; } + $decrypted = decrypt($secret); + + if (! is_string($decrypted)) { + return false; + } + $codeIsValid = app(TwoFactorAuthenticationProvider::class) - ->verify((string) decrypt($secret), $code); + ->verify($decrypted, $code); if (! $codeIsValid) { return false; diff --git a/Updated_Cms/app/Models/WebsiteAd.php b/Updated_Cms/app/Models/WebsiteAd.php index cdb00c5d25..4fe8379c1c 100644 --- a/Updated_Cms/app/Models/WebsiteAd.php +++ b/Updated_Cms/app/Models/WebsiteAd.php @@ -29,7 +29,7 @@ class WebsiteAd extends Model $adsPicturePath = Cache::remember('ads_picture_path', 3600, fn () => $settingsService->getOrDefault('ads_picture_path')); if (! str_starts_with($adsPicturePath, 'http')) { - $adsPicturePath = rtrim((string) (config('app.url') ?? ''), '/') . '/' . ltrim($adsPicturePath, '/'); + $adsPicturePath = rtrim(strval(config('app.url') ?? ''), '/') . '/' . ltrim($adsPicturePath, '/'); } return rtrim($adsPicturePath, '/') . '/' . $this->image; });