diff --git a/server/src/Models/Product.php b/server/src/Models/Product.php index 6d1ffce2..f1be8d5f 100644 --- a/server/src/Models/Product.php +++ b/server/src/Models/Product.php @@ -14,6 +14,7 @@ use Fleetbase\Traits\HasPublicid; use Fleetbase\Traits\HasUuid; use Fleetbase\Traits\Searchable; +use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Support\Arr; use Illuminate\Support\Str; use Milon\Barcode\Facades\DNS2DFacade as DNS2D; @@ -170,18 +171,12 @@ public function category() return $this->setConnection(config('fleetbase.connection.db'))->belongsTo(Category::class); } - /** - * @return \Illuminate\Database\Eloquent\Relations\HasMany - */ - public function addonCategories() + public function addonCategories(): HasMany { return $this->hasMany(ProductAddonCategory::class); } - /** - * @return \Illuminate\Database\Eloquent\Relations\HasMany - */ - public function variants() + public function variants(): HasMany { return $this->hasMany(ProductVariant::class); } @@ -194,16 +189,13 @@ public function primaryImage() return $this->setConnection(config('fleetbase.connection.db'))->belongsTo(File::class); } - /** - * @return \Illuminate\Database\Eloquent\Relations\HasMany - */ - public function files() + public function files(): HasMany { return $this->setConnection(config('fleetbase.connection.db'))->hasMany(File::class, 'subject_uuid'); } /** - * @return \Illuminate\Database\Eloquent\Relations\HasMany + * @return HasMany */ public function reviews() { @@ -211,17 +203,14 @@ public function reviews() } /** - * @return \Illuminate\Database\Eloquent\Relations\HasMany + * @return HasMany */ public function votes() { return $this->hasMany(Vote::class, 'subject_uuid'); } - /** - * @return \Illuminate\Database\Eloquent\Relations\HasMany - */ - public function hours() + public function hours(): HasMany { return $this->hasMany(ProductHour::class); } diff --git a/server/src/Models/ProductAddonCategory.php b/server/src/Models/ProductAddonCategory.php index 46584b05..a54413e9 100644 --- a/server/src/Models/ProductAddonCategory.php +++ b/server/src/Models/ProductAddonCategory.php @@ -5,6 +5,7 @@ use Fleetbase\Casts\Json; use Fleetbase\Traits\HasApiModelBehavior; use Fleetbase\Traits\HasUuid; +use Illuminate\Database\Eloquent\Relations\BelongsTo; class ProductAddonCategory extends StorefrontModel { @@ -62,16 +63,13 @@ class ProductAddonCategory extends StorefrontModel */ protected $hidden = ['product']; - /** - * @return \Illuminate\Database\Eloquent\Relations\BelongsTo - */ - public function category() + public function category(): BelongsTo { return $this->setConnection(config('fleetbase.connection.db'))->belongsTo(AddonCategory::class)->with(['addons']); } /** - * @return \Illuminate\Database\Eloquent\Relations\BelongsTo + * @return BelongsTo */ public function product() { diff --git a/server/src/Models/ProductVariant.php b/server/src/Models/ProductVariant.php index b867b2ad..fdb75d88 100644 --- a/server/src/Models/ProductVariant.php +++ b/server/src/Models/ProductVariant.php @@ -9,6 +9,7 @@ use Fleetbase\Traits\HasMetaAttributes; use Fleetbase\Traits\HasPublicid; use Fleetbase\Traits\HasUuid; +use Illuminate\Database\Eloquent\Relations\HasMany; use Spatie\Sluggable\HasSlug; use Spatie\Sluggable\SlugOptions; @@ -119,10 +120,7 @@ public function product() return $this->belongsTo(Product::class); } - /** - * @return \Illuminate\Database\Eloquent\Relations\HasMany - */ - public function options() + public function options(): HasMany { return $this->hasMany(ProductVariantOption::class); } diff --git a/server/src/Models/Store.php b/server/src/Models/Store.php index 5a5cb23e..3a858406 100644 --- a/server/src/Models/Store.php +++ b/server/src/Models/Store.php @@ -20,6 +20,7 @@ use Fleetbase\Traits\HasPublicid; use Fleetbase\Traits\HasUuid; use Fleetbase\Traits\Searchable; +use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Support\Carbon; use Spatie\Sluggable\HasSlug; use Spatie\Sluggable\SlugOptions; @@ -282,7 +283,7 @@ public function networkStores() } /** - * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany + * @return BelongsToMany */ /** * Catalog assignments pointing at this store. @@ -316,7 +317,7 @@ public function scopeActiveInNetwork($query, ?string $networkUuid) return $query->whereHas('networks', fn ($networkQuery) => $networkQuery->where('network_uuid', $networkUuid)->where('network_stores.status', NetworkStore::STATUS_ACTIVE)); } - public function networks() + public function networks(): BelongsToMany { return $this->belongsToMany(Network::class, 'network_stores', 'store_uuid', 'network_uuid') ->using(NetworkStore::class) diff --git a/server/src/Models/StoreLocation.php b/server/src/Models/StoreLocation.php index 24c428c3..26a6a249 100644 --- a/server/src/Models/StoreLocation.php +++ b/server/src/Models/StoreLocation.php @@ -8,6 +8,7 @@ use Fleetbase\Traits\HasApiModelBehavior; use Fleetbase\Traits\HasPublicid; use Fleetbase\Traits\HasUuid; +use Illuminate\Database\Eloquent\Relations\HasMany; class StoreLocation extends StorefrontModel { @@ -102,10 +103,7 @@ public function store() return $this->belongsTo(Store::class); } - /** - * @return \Illuminate\Database\Eloquent\Relations\BelongsTo - */ - public function hours() + public function hours(): HasMany { return $this->hasMany(StoreHour::class); }