static analizys update

This commit is contained in:
Anatoliy Poloz
2024-01-15 15:10:57 +03:00
parent 30e4c21a47
commit 09a8900690
69 changed files with 638 additions and 575 deletions

View File

@@ -4,6 +4,7 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Query\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(mixed $query, int $userId): Builder
{
return $query
->where('from_user_id', $userId)
@@ -45,12 +46,12 @@ 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)
->where('to_user_id', $recipientId)
->orWhere(function ($query) use ($userId, $recipientId) {
->orWhere(function (Builder $query) use ($userId, $recipientId) {
return $query->where('from_user_id', $recipientId)
->where('to_user_id', $userId);
})
@@ -58,12 +59,12 @@ class Chat extends Model
->limit(20);
}
public function scopeWithLastMessage(mixed $query, int $userId, int $recipientId)
public function scopeWithLastMessage(Builder $query, int $userId, int $recipientId): null|object
{
return $query
->where('from_user_id', $userId)
->where('to_user_id', $recipientId)
->orWhere(function ($query) use ($userId, $recipientId) {
->orWhere(function (Builder $query) use ($userId, $recipientId) {
return $query->where('from_user_id', $recipientId)
->where('to_user_id', $userId);
})