make static-analyse code

This commit is contained in:
2024-01-15 01:05:10 +03:00
parent 57244b63be
commit bc2c8df9af
35 changed files with 221 additions and 182 deletions

View File

@@ -121,7 +121,7 @@ class BlogPost extends Model implements Viewable
return $query->setEagerLoads([]);
}
public function scopeContainsTag(Builder $query, string $tagString): Builder
public function scopeContainsTag(Builder $query, string $tagString): MorphToMany
{
$tagId = Str::of($tagString)->split('/-/')->first();

View File

@@ -4,6 +4,7 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Builder;
/**
* App\Models\Chat
@@ -36,7 +37,7 @@ class Chat extends Model
protected $casts = ['created_at' => 'datetime:Y-m-d H:i:s'];
public function scopeWithLastUserMessage(mixed $query, int $userId)
public function scopeWithLastUserMessage(Builder $query, int $userId): Model|null
{
return $query
->where('from_user_id', $userId)
@@ -45,7 +46,7 @@ class Chat extends Model
->first();
}
public function scopeWithLastTenMessages(mixed $query, int $userId, int $recipientId)
public function scopeWithLastTenMessages(Builder $query, int $userId, int $recipientId): Builder
{
return $query
->where('from_user_id', $userId)
@@ -58,7 +59,7 @@ class Chat extends Model
->limit(20);
}
public function scopeWithLastMessage(mixed $query, int $userId, int $recipientId)
public function scopeWithLastMessage(Builder $query, int $userId, int $recipientId): Model|null
{
return $query
->where('from_user_id', $userId)

View File

@@ -4,6 +4,7 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
/**
* App\Models\CircumferenceMeasure
@@ -37,7 +38,7 @@ class CircumferenceMeasure extends Model
protected $guarded = [];
public function user()
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}

View File

@@ -4,6 +4,7 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
/**
* App\Models\ConsultantEducation
@@ -45,7 +46,7 @@ class ConsultantEducation extends Model
protected $guarded = [];
public function user()
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}

View File

@@ -5,6 +5,9 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Builder;
/**
* App\Models\Diary
@@ -49,26 +52,26 @@ class Diary extends Model
// protected $casts = ['date' => 'datetime:d-m-Y'];
// protected $dateFormat = 'd-m-Y';
public function user()
public function user(): BelongsTo
{
return $this->belongsTo(User::class)->withDefault([
'name' => 'Guest Author',
]);
}
public function meals()
public function meals():HasMany
{
return $this->hasMany(Meal::class);
}
public function scopeUserToDayItem($query, $userId)
public function scopeUserToDayItem(Builder $query, int $userId): Builder
{
return $query
->where('user_id', $userId)
->where('date', now()->format('Y-m-d'));
}
public function consultant_comments()
public function consultant_comments(): HasMany
{
return $this->hasMany(ConsultantDiaryComment::class);
}

View File

@@ -4,6 +4,9 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasMany;
/**
* App\Models\Meal
@@ -46,24 +49,24 @@ class Meal extends Model
protected $fillable = ['*'];
public function user()
public function user(): BelongsTo
{
return $this->belongsTo(User::class)->withDefault([
'name' => 'Guest Author',
]);
}
public function diary()
public function diary(): BelongsTo
{
return $this->belongsTo(Diary::class);
}
public function portions()
public function portions(): HasMany
{
return $this->hasMany(Portion::class);
}
public function photos()
public function photos(): BelongsToMany
{
return $this->belongsToMany(UserAttachment::class);
}

View File

@@ -4,6 +4,7 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
/**
* App\Models\Portion
@@ -37,7 +38,7 @@ class Portion extends Model
protected $fillable = ['*'];
public function user()
public function user(): BelongsTo
{
return $this->belongsTo(Meal::class);
}

View File

@@ -38,7 +38,7 @@ class Tag extends Model
protected $guarded = [];
public function blogPosts()
public function blogPosts(): MorphToMany
{
return $this->morphedByMany(BlogPost::class, 'taggable', 'taggables');
}

View File

@@ -4,6 +4,9 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
/**
* App\Models\UserAttachment
@@ -44,17 +47,17 @@ class UserAttachment extends Model
protected $guarded = [];
public function user()
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}
public function scopeCerts($query)
public function scopeCerts(Builder $query): Builder
{
return $query->where('user_attachments.group', 'user_certs');
}
public function meals()
public function meals(): BelongsToMany
{
return $this->belongsToMany(Meal::class);
}

View File

@@ -4,6 +4,7 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
/**
* App\Models\UserDetailz
@@ -80,7 +81,7 @@ class UserDetailz extends Model
protected $guarded = [];
public function user()
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}

View File

@@ -4,6 +4,7 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
/**
* App\Models\WeightMeasure
@@ -33,7 +34,7 @@ class WeightMeasure extends Model
protected $guarded = [];
public function user()
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}