Merge pull request #347 from karlomikus/develop

Update docs

CHANGELOG.md

@@ -1,3 +1,10 @@
+# v4.0.3
+## Changes
+- Added prod target to docker image
+
+## Fixes
+- Fixed wrong endpoint name
+
 # v4.0.2
 ## Fixes
 - Fixed a bug where the bar import command checked the wrong filepath

app/Http/Controllers/AuthController.php

@@ -166,7 +166,7 @@ function (User $user, string $password) {
         abort(400, $status);
     }
 
-    #[OAT\Post(path: '/auth/verify/{id}/{hash}', tags: ['Authentication'], summary: 'Confirm user account', parameters: [
+    #[OAT\Get(path: '/auth/verify/{id}/{hash}', tags: ['Authentication'], summary: 'Confirm user account', parameters: [
         new OAT\Parameter(name: 'id', in: 'path', required: true, description: 'Database id of a user', schema: new OAT\Schema(type: 'integer')),
         new OAT\Parameter(name: 'hash', in: 'path', required: true, description: 'Hash string sent to user email', schema: new OAT\Schema(type: 'string')),
     ], security: [])]

app/Models/Bar.php

@@ -72,7 +72,7 @@ public function getSlugOptions(): SlugOptions
     }
 
     /**
-     * @return BelongsToMany<User>
+     * @return BelongsToMany<User, $this>
      */
     public function users(): BelongsToMany
     {
@@ -82,31 +82,31 @@ public function users(): BelongsToMany
     }
 
     /**
-     * @return HasMany<BarMembership>
+     * @return HasMany<BarMembership, $this>
      */
     public function memberships(): HasMany
     {
         return $this->hasMany(BarMembership::class);
     }
 
     /**
-     * @return HasMany<Cocktail>
+     * @return HasMany<Cocktail, $this>
      */
     public function cocktails(): HasMany
     {
         return $this->hasMany(Cocktail::class);
     }
 
     /**
-     * @return HasMany<Ingredient>
+     * @return HasMany<Ingredient, $this>
      */
     public function ingredients(): HasMany
     {
         return $this->hasMany(Ingredient::class);
     }
 
     /**
-     * @return HasMany<Export>
+     * @return HasMany<Export, $this>
      */
     public function exports(): HasMany
     {

app/Models/BarMembership.php

@@ -21,55 +21,55 @@ class BarMembership extends Model
     ];
 
     /**
-     * @return BelongsTo<Bar, BarMembership>
+     * @return BelongsTo<Bar, $this>
      */
     public function bar(): BelongsTo
     {
         return $this->belongsTo(Bar::class);
     }
 
     /**
-     * @return BelongsTo<UserRole, BarMembership>
+     * @return BelongsTo<UserRole, $this>
      */
     public function role(): BelongsTo
     {
         return $this->belongsTo(UserRole::class, 'user_role_id');
     }
 
     /**
-     * @return BelongsTo<User, BarMembership>
+     * @return BelongsTo<User, $this>
      */
     public function user(): BelongsTo
     {
         return $this->belongsTo(User::class);
     }
 
     /**
-     * @return HasMany<UserIngredient>
+     * @return HasMany<UserIngredient, $this>
      */
     public function userIngredients(): HasMany
     {
         return $this->hasMany(UserIngredient::class);
     }
 
     /**
-     * @return HasMany<UserShoppingList>
+     * @return HasMany<UserShoppingList, $this>
      */
     public function shoppingListIngredients(): HasMany
     {
         return $this->hasMany(UserShoppingList::class);
     }
 
     /**
-     * @return HasMany<CocktailFavorite>
+     * @return HasMany<CocktailFavorite, $this>
      */
     public function cocktailFavorites(): HasMany
     {
         return $this->hasMany(CocktailFavorite::class);
     }
 
     /**
-     * @return HasMany<CocktailCollection>
+     * @return HasMany<CocktailCollection, $this>
      */
     public function cocktailCollections(): HasMany
     {

app/Models/Cocktail.php

@@ -60,55 +60,55 @@ public function getExternalId(): string
     }
 
     /**
-     * @return BelongsTo<Glass, Cocktail>
+     * @return BelongsTo<Glass, $this>
      */
     public function glass(): BelongsTo
     {
         return $this->belongsTo(Glass::class);
     }
 
     /**
-     * @return BelongsTo<Bar, Cocktail>
+     * @return BelongsTo<Bar, $this>
      */
     public function bar(): BelongsTo
     {
         return $this->belongsTo(Bar::class);
     }
 
     /**
-     * @return HasMany<CocktailIngredient>
+     * @return HasMany<CocktailIngredient, $this>
      */
     public function ingredients(): HasMany
     {
         return $this->hasMany(CocktailIngredient::class)->orderBy('sort');
     }
 
     /**
-     * @return BelongsToMany<Tag>
+     * @return BelongsToMany<Tag, $this>
      */
     public function tags(): BelongsToMany
     {
         return $this->belongsToMany(Tag::class);
     }
 
     /**
-     * @return BelongsToMany<Utensil>
+     * @return BelongsToMany<Utensil, $this>
      */
     public function utensils(): BelongsToMany
     {
         return $this->belongsToMany(Utensil::class);
     }
 
     /**
-     * @return BelongsTo<CocktailMethod, Cocktail>
+     * @return BelongsTo<CocktailMethod, $this>
      */
     public function method(): BelongsTo
     {
         return $this->belongsTo(CocktailMethod::class, 'cocktail_method_id');
     }
 
     /**
-     * @return BelongsToMany<CocktailCollection>
+     * @return BelongsToMany<CocktailCollection, $this>
      */
     public function collections(): BelongsToMany
     {

app/Models/CocktailFavorite.php

@@ -14,15 +14,15 @@ class CocktailFavorite extends Model
     use HasFactory;
 
     /**
-     * @return BelongsTo<Cocktail, CocktailFavorite>
+     * @return BelongsTo<Cocktail, $this>
      */
     public function cocktail(): BelongsTo
     {
         return $this->belongsTo(Cocktail::class);
     }
 
     /**
-     * @return BelongsTo<BarMembership, CocktailFavorite>
+     * @return BelongsTo<BarMembership, $this>
      */
     public function barMembership(): BelongsTo
     {

app/Models/CocktailIngredient.php

@@ -24,23 +24,23 @@ class CocktailIngredient extends Model
     ];
 
     /**
-     * @return BelongsTo<Ingredient, CocktailIngredient>
+     * @return BelongsTo<Ingredient, $this>
      */
     public function ingredient(): BelongsTo
     {
         return $this->belongsTo(Ingredient::class);
     }
 
     /**
-     * @return BelongsTo<Cocktail, CocktailIngredient>
+     * @return BelongsTo<Cocktail, $this>
      */
     public function cocktail(): BelongsTo
     {
         return $this->belongsTo(Cocktail::class);
     }
 
     /**
-     * @return HasMany<CocktailIngredientSubstitute>
+     * @return HasMany<CocktailIngredientSubstitute, $this>
      */
     public function substitutes(): HasMany
     {

app/Models/CocktailIngredientSubstitute.php

@@ -15,15 +15,15 @@ class CocktailIngredientSubstitute extends Model
     use HasFactory;
 
     /**
-     * @return BelongsTo<CocktailIngredient, CocktailIngredientSubstitute>
+     * @return BelongsTo<CocktailIngredient, $this>
      */
     public function cocktailIngredient(): BelongsTo
     {
         return $this->belongsTo(CocktailIngredient::class);
     }
 
     /**
-     * @return BelongsTo<Ingredient, CocktailIngredientSubstitute>
+     * @return BelongsTo<Ingredient, $this>
      */
     public function ingredient(): BelongsTo
     {

app/Models/CocktailMethod.php

@@ -19,15 +19,15 @@ class CocktailMethod extends Model
     use HasAuthors;
 
     /**
-     * @return HasMany<Cocktail>
+     * @return HasMany<Cocktail, $this>
      */
     public function cocktails(): HasMany
     {
         return $this->hasMany(Cocktail::class);
     }
 
     /**
-     * @return BelongsTo<Bar, CocktailMethod>
+     * @return BelongsTo<Bar, $this>
      */
     public function bar(): BelongsTo
     {

app/Models/Collection.php

@@ -19,15 +19,15 @@ class Collection extends Model
     ];
 
     /**
-     * @return BelongsToMany<Cocktail>
+     * @return BelongsToMany<Cocktail, $this>
      */
     public function cocktails(): BelongsToMany
     {
         return $this->belongsToMany(Cocktail::class, 'collections_cocktails')->orderBy('name');
     }
 
     /**
-     * @return BelongsTo<BarMembership, Collection>
+     * @return BelongsTo<BarMembership, $this>
      */
     public function barMembership(): BelongsTo
     {

app/Models/ComplexIngredient.php

@@ -18,15 +18,15 @@ class ComplexIngredient extends Model
     public $timestamps = false;
 
     /**
-     * @return BelongsTo<Ingredient, ComplexIngredient>
+     * @return BelongsTo<Ingredient, $this>
      */
     public function mainIngredient(): BelongsTo
     {
         return $this->belongsTo(Ingredient::class, 'main_ingredient_id');
     }
 
     /**
-     * @return BelongsTo<Ingredient, ComplexIngredient>
+     * @return BelongsTo<Ingredient, $this>
      */
     public function ingredient(): BelongsTo
     {

app/Models/Concerns/HasAuthors.php

@@ -10,15 +10,15 @@
 trait HasAuthors
 {
     /**
-     * @return BelongsTo<User, self>
+     * @return BelongsTo<User, $this>
      */
     public function createdUser(): BelongsTo
     {
         return $this->belongsTo(User::class, 'created_user_id');
     }
 
     /**
-     * @return BelongsTo<User, self>
+     * @return BelongsTo<User, $this>
      */
     public function updatedUser(): BelongsTo
     {

app/Models/Concerns/HasImages.php

@@ -13,7 +13,7 @@
 trait HasImages
 {
     /**
-     * @return MorphMany<Image>
+     * @return MorphMany<Image, $this>
      */
     public function images(): MorphMany
     {

app/Models/Concerns/HasNotes.php

@@ -11,7 +11,7 @@
 trait HasNotes
 {
     /**
-     * @return MorphMany<Note>
+     * @return MorphMany<Note, $this>
      */
     public function notes(): MorphMany
     {

app/Models/Concerns/HasRating.php

@@ -10,7 +10,7 @@
 trait HasRating
 {
     /**
-     * @return MorphMany<Rating>
+     * @return MorphMany<Rating, $this>
      */
     public function ratings(): MorphMany
     {

app/Models/Export.php

@@ -19,7 +19,7 @@ class Export extends Model
     use HasBarAwareScope;
 
     /**
-     * @return BelongsTo<Bar, Export>
+     * @return BelongsTo<Bar, $this>
      */
     public function bar(): BelongsTo
     {

app/Models/Glass.php

@@ -43,15 +43,15 @@ protected function volume(): Attribute
     }
 
     /**
-     * @return HasMany<Cocktail>
+     * @return HasMany<Cocktail, $this>
      */
     public function cocktails(): HasMany
     {
         return $this->hasMany(Cocktail::class);
     }
 
     /**
-     * @return BelongsTo<Bar, Glass>
+     * @return BelongsTo<Bar, $this>
      */
     public function bar(): BelongsTo
     {

app/Models/Image.php

@@ -60,10 +60,11 @@ public function getFileName(): ?string
     }
 
     /**
-     * @return MorphTo<Ingredient|Cocktail|Model, Image>
+     * @return MorphTo<Ingredient|Cocktail, $this>
      */
     public function imageable(): MorphTo
     {
+        /** @phpstan-ignore-next-line */
         return $this->morphTo();
     }