Removes Array Definition Docblock Information

Part of moving back to PHPStan level 5 means we can remove some of these. They're very busy and don't give enough context to outweigh the ugly.
This commit is contained in:
Refringe 2024-09-17 13:30:11 -04:00
parent df779135c1
commit 2cca45bcea
Signed by: Refringe
SSH Key Fingerprint: SHA256:t865XsQpfTeqPRBMN2G6+N8wlDjkgUCZF3WGW6O9N/k
46 changed files with 9 additions and 265 deletions

View File

@ -8,8 +8,6 @@ trait PasswordValidationRules
{
/**
* Get the validation rules used to validate passwords.
*
* @return array<int, \Illuminate\Contracts\Validation\Rule|array<mixed>|string>
*/
protected function passwordRules(): array
{

View File

@ -13,8 +13,6 @@ class ResetUserPassword implements ResetsUserPasswords
/**
* Validate and reset the user's forgotten password.
*
* @param array<string, string> $input
*/
public function reset(User $user, array $input): void
{

View File

@ -13,8 +13,6 @@ class UpdateUserPassword implements UpdatesUserPasswords
/**
* Validate and update the user's password.
*
* @param array<string, string> $input
*/
public function update(User $user, array $input): void
{

View File

@ -12,8 +12,6 @@ class UpdateUserProfileInformation implements UpdatesUserProfileInformation
{
/**
* Validate and update the given user's profile information.
*
* @param array<string, mixed> $input
*/
public function update(User $user, array $input): void
{

View File

@ -12,8 +12,6 @@ class ApiController extends Controller
/**
* Determine if the given relationship should be included in the request. If more than one relationship is provided,
* only one needs to be present in the request for this method to return true.
*
* @param string|string[] $relationships
*/
public static function shouldInclude(string|array $relationships): bool
{

View File

@ -38,8 +38,6 @@ class ModController extends ApiController
return ModResource::collection(Mod::filter($filters)->paginate());
}
//public function store(StoreModRequest $request): void {}
/**
* Get Mod
*
@ -53,8 +51,4 @@ class ModController extends ApiController
{
return new ModResource($mod);
}
//public function update(UpdateModRequest $request, Mod $mod): void {}
//public function destroy(Mod $mod): void {}
}

View File

@ -29,8 +29,6 @@ class UsersController extends ApiController
return UserResource::collection(User::filter($filters)->paginate());
}
//public function store(StoreUserRequest $request): void {}
/**
* Get User
*
@ -43,8 +41,4 @@ class UsersController extends ApiController
{
return new UserResource($user);
}
//public function update(UpdateUserRequest $request, User $user): void {}
//public function destroy(User $user): void {}
}

View File

@ -10,22 +10,16 @@ class ModFilter
{
/**
* The query builder instance for the mod model.
*
* @var Builder<Mod>
*/
protected Builder $builder;
/**
* The filters to apply.
*
* @var array<string, mixed>
*/
protected array $filters;
/**
* Constructor.
*
* @param array<string, mixed> $filters
* Create a new ModFilter instance.
*/
public function __construct(array $filters)
{
@ -35,8 +29,6 @@ class ModFilter
/**
* The base query for the mod listing.
*
* @return Builder<Mod>
*/
private function baseQuery(): Builder
{
@ -59,8 +51,6 @@ class ModFilter
/**
* Filter the results by the given search term.
*
* @return Builder<Mod>
*/
private function query(string $term): Builder
{
@ -69,8 +59,6 @@ class ModFilter
/**
* Apply the filters to the query.
*
* @return Builder<Mod>
*/
public function apply(): Builder
{
@ -85,8 +73,6 @@ class ModFilter
/**
* Order the query by the given type.
*
* @return Builder<Mod>
*/
private function order(string $type): Builder
{
@ -99,8 +85,6 @@ class ModFilter
/**
* Filter the results by the featured status.
*
* @return Builder<Mod>
*/
private function featured(string $option): Builder
{
@ -113,9 +97,6 @@ class ModFilter
/**
* Filter the results to specific SPT versions.
*
* @param array<int, string> $versions
* @return Builder<Mod>
*/
private function sptVersions(array $versions): Builder
{

View File

@ -12,8 +12,6 @@ class ModFilter extends QueryFilter
{
/**
* The sortable fields.
*
* @var array<string>
*/
protected array $sortable = [
'name',
@ -30,8 +28,6 @@ class ModFilter extends QueryFilter
/**
* Filter by ID.
*
* @return Builder<Mod>
*/
public function id(string $value): Builder
{
@ -40,8 +36,6 @@ class ModFilter extends QueryFilter
/**
* Filter by hub ID.
*
* @return Builder<Mod>
*/
public function hub_id(string $value): Builder
{
@ -50,8 +44,6 @@ class ModFilter extends QueryFilter
/**
* Filter by name.
*
* @return Builder<Mod>
*/
public function name(string $value): Builder
{
@ -60,8 +52,6 @@ class ModFilter extends QueryFilter
/**
* Filter by slug.
*
* @return Builder<Mod>
*/
public function slug(string $value): Builder
{
@ -70,8 +60,6 @@ class ModFilter extends QueryFilter
/**
* Filter by teaser.
*
* @return Builder<Mod>
*/
public function teaser(string $value): Builder
{
@ -80,8 +68,6 @@ class ModFilter extends QueryFilter
/**
* Filter by source code link.
*
* @return Builder<Mod>
*/
public function source_code_link(string $value): Builder
{
@ -90,8 +76,6 @@ class ModFilter extends QueryFilter
/**
* Filter by created at date.
*
* @return Builder<Mod>
*/
public function created_at(string $value): Builder
{
@ -100,8 +84,6 @@ class ModFilter extends QueryFilter
/**
* Filter by updated at date.
*
* @return Builder<Mod>
*/
public function updated_at(string $value): Builder
{
@ -110,8 +92,6 @@ class ModFilter extends QueryFilter
/**
* Filter by published at date.
*
* @return Builder<Mod>
*/
public function published_at(string $value): Builder
{
@ -120,8 +100,6 @@ class ModFilter extends QueryFilter
/**
* Filter by featured.
*
* @return Builder<Mod>
*/
public function featured(string $value): Builder
{
@ -130,8 +108,6 @@ class ModFilter extends QueryFilter
/**
* Filter by contains ads.
*
* @return Builder<Mod>
*/
public function contains_ads(string $value): Builder
{
@ -140,8 +116,6 @@ class ModFilter extends QueryFilter
/**
* Filter by contains AI content.
*
* @return Builder<Mod>
*/
public function contains_ai_content(string $value): Builder
{

View File

@ -4,25 +4,17 @@ namespace App\Http\Filters\V1;
use App\Traits\V1\FilterMethods;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Http\Request;
/**
* @template TModelClass of Model
*/
abstract class QueryFilter
{
/**
* Include general filter methods.
*
* @use FilterMethods<TModelClass>
*/
use FilterMethods;
/**
* The query builder instance.
*
* @var Builder<TModelClass>
*/
protected Builder $builder;
@ -33,8 +25,6 @@ abstract class QueryFilter
/**
* The sortable fields.
*
* @var array<string>
*/
protected array $sortable = [];
@ -48,9 +38,6 @@ abstract class QueryFilter
/**
* Iterate over each of the filter options and call the appropriate method if it exists.
*
* @param array<string, string> $filters
* @return Builder<TModelClass>
*/
public function filter(array $filters): Builder
{
@ -65,9 +52,6 @@ abstract class QueryFilter
/**
* Iterate over all request data and call the appropriate method if it exists.
*
* @param Builder<TModelClass> $builder
* @return Builder<TModelClass>
*/
public function apply(Builder $builder): Builder
{

View File

@ -12,8 +12,6 @@ class UserFilter extends QueryFilter
{
/**
* The sortable fields.
*
* @var array<string>
*/
protected array $sortable = [
'name',
@ -23,8 +21,6 @@ class UserFilter extends QueryFilter
/**
* Filter by ID.
*
* @return Builder<User>
*/
public function id(string $value): Builder
{
@ -33,8 +29,6 @@ class UserFilter extends QueryFilter
/**
* Filter by name.
*
* @return Builder<User>
*/
public function name(string $value): Builder
{
@ -43,8 +37,6 @@ class UserFilter extends QueryFilter
/**
* Filter by created at date.
*
* @return Builder<User>
*/
public function created_at(string $value): Builder
{
@ -53,8 +45,6 @@ class UserFilter extends QueryFilter
/**
* Filter by updated at date.
*
* @return Builder<User>
*/
public function updated_at(string $value): Builder
{

View File

@ -16,8 +16,6 @@ class LoginUserRequest extends FormRequest
/**
* Get the validation rules that apply to the request.
*
* @return array<string, mixed>
*/
public function rules(): array
{

View File

@ -16,8 +16,6 @@ class StoreModRequest extends FormRequest
/**
* Get the validation rules that apply to the request.
*
* @return array<string, mixed>
*/
public function rules(): array
{

View File

@ -16,8 +16,6 @@ class StoreUserRequest extends FormRequest
/**
* Get the validation rules that apply to the request.
*
* @return array<string, mixed>
*/
public function rules(): array
{

View File

@ -16,8 +16,6 @@ class UpdateModRequest extends FormRequest
/**
* Get the validation rules that apply to the request.
*
* @return array<string, mixed>
*/
public function rules(): array
{

View File

@ -16,8 +16,6 @@ class UpdateUserRequest extends FormRequest
/**
* Get the validation rules that apply to the request.
*
* @return array<string, mixed>
*/
public function rules(): array
{

View File

@ -8,8 +8,6 @@ class ModRequest extends FormRequest
{
/**
* Get the validation rules that apply to the request.
*
* @return array<string, mixed>
*/
public function rules(): array
{

View File

@ -11,8 +11,6 @@ class LicenseResource extends JsonResource
{
/**
* Transform the resource into an array.
*
* @return array<string, mixed>
*/
public function toArray(Request $request): array
{

View File

@ -12,8 +12,6 @@ class ModResource extends JsonResource
{
/**
* Transform the resource into an array.
*
* @return array<string, mixed>
*/
public function toArray(Request $request): array
{

View File

@ -11,8 +11,6 @@ class ModVersionResource extends JsonResource
{
/**
* Transform the resource into an array.
*
* @return array<string, mixed>
*/
public function toArray(Request $request): array
{

View File

@ -12,8 +12,6 @@ class UserResource extends JsonResource
{
/**
* Transform the resource into an array.
*
* @return array<string, mixed>
*/
public function toArray(Request $request): array
{

View File

@ -11,8 +11,6 @@ class UserRoleResource extends JsonResource
{
/**
* Transform the resource into an array.
*
* @return array<string, mixed>
*/
public function toArray(Request $request): array
{

View File

@ -11,8 +11,6 @@ class LicenseResource extends JsonResource
{
/**
* Transform the resource into an array.
*
* @return array<string, mixed>
*/
public function toArray(Request $request): array
{

View File

@ -11,8 +11,6 @@ class ModResource extends JsonResource
{
/**
* Transform the resource into an array.
*
* @return array<string, mixed>
*/
public function toArray(Request $request): array
{

View File

@ -11,8 +11,6 @@ class ModVersionResource extends JsonResource
{
/**
* Transform the resource into an array.
*
* @return array<string, mixed>
*/
public function toArray(Request $request): array
{

View File

@ -11,8 +11,6 @@ class SptVersionResource extends JsonResource
{
/**
* Transform the resource into an array.
*
* @return array<string, mixed>
*/
public function toArray(Request $request): array
{

View File

@ -348,8 +348,6 @@ class ImportHubDataJob implements ShouldBeUnique, ShouldQueue
/**
* Build an array of user data ready to be inserted into the local database.
*
* @return array<string, mixed>
*/
protected function collectUserData(CurlHandle $curl, HubUser $hubUser): array
{
@ -464,8 +462,6 @@ class ImportHubDataJob implements ShouldBeUnique, ShouldQueue
/**
* Build an array of banned user data ready to be inserted into the local database.
*
* @return array<string, mixed>|null
*/
protected function collectBannedUserData(HubUser $hubUser): ?array
{
@ -522,8 +518,6 @@ class ImportHubDataJob implements ShouldBeUnique, ShouldQueue
/**
* Build an array of user rank data ready to be inserted into the local database.
*
* @return array<string, mixed>|null
*/
protected function collectUserRankData(HubUser $hubUser): ?array
{
@ -539,8 +533,6 @@ class ImportHubDataJob implements ShouldBeUnique, ShouldQueue
/**
* Insert or update the users in the local database.
*
* @param array<array<string, mixed>> $usersData
*/
protected function upsertUsers(array $usersData): void
{
@ -557,8 +549,6 @@ class ImportHubDataJob implements ShouldBeUnique, ShouldQueue
/**
* Fetch the hub-banned users from the local database and ban them locally.
*
* @param array<array<string, mixed>> $bannedUsers
*/
protected function handleBannedUsers(array $bannedUsers): void
{
@ -573,8 +563,6 @@ class ImportHubDataJob implements ShouldBeUnique, ShouldQueue
/**
* Fetch or create the user ranks in the local database and assign them to the users.
*
* @param array<array<string, mixed>> $userRanks
*/
protected function handleUserRoles(array $userRanks): void
{
@ -591,8 +579,6 @@ class ImportHubDataJob implements ShouldBeUnique, ShouldQueue
/**
* Build the user role data based on the role name.
*
* @return array<string, string>
*/
protected function buildUserRoleData(string $name): array
{
@ -710,8 +696,6 @@ class ImportHubDataJob implements ShouldBeUnique, ShouldQueue
/**
* Get the latest current version from the response data.
*
* @param array<string, array<string, string>> $versions
*/
protected function getLatestVersion(array $versions): string
{

View File

@ -35,8 +35,6 @@ class GlobalSearch extends Component
/**
* Execute the search against each of the searchable models.
*
* @return array<string, array<array<string, mixed>>>
*/
protected function executeSearch(string $query): array
{
@ -58,8 +56,6 @@ class GlobalSearch extends Component
/**
* Fetch the user search results.
*
* @return Collection<int, array<string, mixed>>
*/
protected function fetchUserResults(string $query): Collection
{
@ -71,8 +67,6 @@ class GlobalSearch extends Component
/**
* Fetch the mod search results.
*
* @return Collection<int, array<string, mixed>>
*/
protected function fetchModResults(string $query): Collection
{
@ -84,8 +78,6 @@ class GlobalSearch extends Component
/**
* Count the total number of results across all models.
*
* @param array<string, Collection<int, array<string, mixed>>> $results
*/
protected function countTotalResults(array $results): int
{

View File

@ -3,7 +3,6 @@
namespace App\Livewire\Mod;
use App\Http\Filters\ModFilter;
use App\Models\Mod;
use App\Models\SptVersion;
use Illuminate\Contracts\Pagination\LengthAwarePaginator;
use Illuminate\Contracts\View\View;
@ -32,8 +31,6 @@ class Listing extends Component
/**
* The SPT versions filter value.
*
* @var array<string>
*/
#[Url]
public array $sptVersions = [];
@ -65,8 +62,6 @@ class Listing extends Component
/**
* Get all patch versions of the latest minor SPT version.
*
* @return Collection<int, SptVersion>
*/
public function getLatestMinorVersions(): Collection
{
@ -96,8 +91,6 @@ class Listing extends Component
/**
* Check if the current page is greater than the last page. Redirect if it is.
*
* @param LengthAwarePaginator<Mod> $mods
*/
private function redirectOutOfBoundsPage(LengthAwarePaginator $mods): void
{

View File

@ -12,8 +12,6 @@ class UpdateProfileForm extends UpdateProfileInformationForm
{
/**
* The new cover photo for the user.
*
* @var mixed
*/
public $cover;

View File

@ -2,7 +2,6 @@
namespace App\Models;
use Database\Factories\LicenseFactory;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasMany;
@ -10,9 +9,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
class License extends Model
{
/** @use HasFactory<LicenseFactory> */
use HasFactory;
use SoftDeletes;
/**

View File

@ -96,8 +96,6 @@ class Mod extends Model
/**
* The data that is searchable by Scout.
*
* @return array<string, mixed>
*/
public function toSearchableArray(): array
{
@ -173,8 +171,6 @@ class Mod extends Model
/**
* Build the URL to the mod's thumbnail.
*
* @return Attribute<string, never>
*/
public function thumbnailUrl(): Attribute
{
@ -198,10 +194,6 @@ class Mod extends Model
/**
* Scope a query by applying QueryFilter filters.
*
* @param Builder<Mod> $builder
* @param QueryFilter<Mod> $filters
* @return Builder<Mod>
*/
public function scopeFilter(Builder $builder, QueryFilter $filters): Builder
{
@ -218,8 +210,6 @@ class Mod extends Model
/**
* The attributes that should be cast to native types.
*
* @return array<string, string>
*/
protected function casts(): array
{

View File

@ -2,7 +2,6 @@
namespace App\Models;
use Database\Factories\ModDependencyFactory;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
@ -10,7 +9,6 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
class ModDependency extends Model
{
/** @use HasFactory<ModDependencyFactory> */
use HasFactory;
/**

View File

@ -6,7 +6,6 @@ use App\Exceptions\InvalidVersionNumberException;
use App\Models\Scopes\DisabledScope;
use App\Models\Scopes\PublishedScope;
use App\Support\Version;
use Database\Factories\ModFactory;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
@ -17,15 +16,11 @@ use Illuminate\Database\Eloquent\SoftDeletes;
class ModVersion extends Model
{
/** @use HasFactory<ModFactory> */
use HasFactory;
use SoftDeletes;
/**
* Update the parent mod's updated_at timestamp when the mod version is updated.
*
* @var array<string>
*/
protected $touches = ['mod'];

View File

@ -6,15 +6,10 @@ use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Scope;
/**
* @template TModelClass of Model
*/
class DisabledScope implements Scope
{
/**
* Apply the scope to a given Eloquent query builder.
*
* @param Builder<TModelClass> $builder
*/
public function apply(Builder $builder, Model $model): void
{

View File

@ -6,15 +6,10 @@ use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Scope;
/**
* @template TModelClass of Model
*/
class PublishedScope implements Scope
{
/**
* Apply the scope to a given Eloquent query builder.
*
* @param Builder<TModelClass> $builder
*/
public function apply(Builder $builder, Model $model): void
{

View File

@ -4,7 +4,6 @@ namespace App\Models;
use App\Exceptions\InvalidVersionNumberException;
use App\Support\Version;
use Database\Factories\SptVersionFactory;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
@ -14,15 +13,11 @@ use Illuminate\Support\Facades\Cache;
class SptVersion extends Model
{
/** @use HasFactory<SptVersionFactory> */
use HasFactory;
use SoftDeletes;
/**
* Get all versions for the last three minor versions.
*
* @return Collection<int, SptVersion>
*/
public static function getVersionsForLastThreeMinors(): Collection
{
@ -51,8 +46,6 @@ class SptVersion extends Model
/**
* Get the last three minor versions (major.minor format).
*
* @return array<int, array{major: int, minor: int}>
*/
public static function getLastThreeMinorVersions(): array
{
@ -75,8 +68,6 @@ class SptVersion extends Model
/**
* Extract the version sections from the version string.
*
* @return array{major: int, minor: int, patch: int, pre_release: string}
*
* @throws InvalidVersionNumberException
*/
public static function extractVersionSections(string $version): array

View File

@ -6,7 +6,6 @@ use App\Http\Filters\V1\QueryFilter;
use App\Notifications\ResetPassword;
use App\Notifications\VerifyEmail;
use App\Traits\HasCoverPhoto;
use Database\Factories\UserFactory;
use Illuminate\Contracts\Auth\MustVerifyEmail;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
@ -26,10 +25,7 @@ class User extends Authenticatable implements MustVerifyEmail
use Bannable;
use HasApiTokens;
use HasCoverPhoto;
/** @use HasFactory<UserFactory> */
use HasFactory;
use HasProfilePhoto;
use Notifiable;
use Searchable;
@ -58,8 +54,6 @@ class User extends Authenticatable implements MustVerifyEmail
/**
* The data that is searchable by Scout.
*
* @return array<string, mixed>
*/
public function toSearchableArray(): array
{
@ -150,10 +144,6 @@ class User extends Authenticatable implements MustVerifyEmail
/**
* Scope a query by applying QueryFilter filters.
*
* @param Builder<User> $builder
* @param QueryFilter<User> $filters
* @return Builder<User>
*/
public function scopeFilter(Builder $builder, QueryFilter $filters): Builder
{
@ -170,8 +160,6 @@ class User extends Authenticatable implements MustVerifyEmail
/**
* The attributes that should be cast to native types.
*
* @return array<string, string>
*/
protected function casts(): array
{

View File

@ -2,14 +2,12 @@
namespace App\Models;
use Database\Factories\UserFactory;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasMany;
class UserRole extends Model
{
/** @use HasFactory<UserFactory> */
use HasFactory;
/**

View File

@ -20,8 +20,6 @@ class ResetPassword extends OriginalResetPassword implements ShouldQueue
/**
* Get the array representation of the notification.
*
* @return array<mixed>
*/
public function toArray(object $notifiable): array
{

View File

@ -15,8 +15,6 @@ class VerifyEmail extends OriginalVerifyEmail implements ShouldQueue
/**
* Get the array representation of the notification.
*
* @return array<mixed>
*/
public function toArray(object $notifiable): array
{

View File

@ -18,8 +18,6 @@ class DependencyVersionService
/**
* Satisfies all dependency constraints of a ModVersion.
*
* @return array<int, array<string, int>>
*/
private function satisfyConstraint(ModVersion $modVersion): array
{

View File

@ -19,8 +19,6 @@ class SptVersionService
/**
* Satisfies the version constraint of a given ModVersion. Returns the ID of the satisfying SptVersion.
*
* @return array<int>
*/
private function satisfyConstraint(ModVersion $modVersion): array
{

View File

@ -52,8 +52,6 @@ trait HasCoverPhoto
/**
* Get the cover photo URL for the user.
*
* @return Attribute<string, never>
*/
public function coverPhotoUrl(): Attribute
{

View File

@ -2,93 +2,63 @@
namespace App\Traits\V1;
use App\Http\Filters\V1\QueryFilter;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Str;
/**
* @template TModelClass of Model
*
* @mixin QueryFilter<TModelClass>
*/
trait FilterMethods
{
/**
* Filter using a whereIn clause.
*
* @return Builder<TModelClass>
*/
public function filterWhereIn(string $column, string $value): Builder
{
$ids = array_map('trim', explode(',', $value));
$result = $this->builder->whereIn($column, $ids);
/** @var Builder<TModelClass> $result */
return $result;
return $this->builder->whereIn($column, $ids);
}
/**
* Filter using a LIKE clause with a wildcard characters.
*
* @return Builder<TModelClass>
*/
public function filterByWildcardLike(string $column, string $value): Builder
{
$like = Str::replace('*', '%', $value);
$result = $this->builder->where($column, 'like', $like);
/** @var Builder<TModelClass> $result */
return $result;
return $this->builder->where($column, 'like', $like);
}
/**
* Filter by date range or specific date.
*
* @return Builder<TModelClass>
*/
public function filterByDate(string $column, string $value): Builder
{
$dates = array_map('trim', explode(',', $value));
if (count($dates) > 1) {
$result = $this->builder->whereBetween($column, $dates);
} else {
$result = $this->builder->whereDate($column, $dates[0]);
return $this->builder->whereBetween($column, $dates);
}
/** @var Builder<TModelClass> $result */
return $result;
return $this->builder->whereDate($column, $dates[0]);
}
/**
* Filter by boolean value.
*
* @return Builder<TModelClass>
*/
public function filterByBoolean(string $column, string $value): Builder
{
$value = filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
if ($value === null) {
$result = $this->builder; // The unmodified builder
} else {
$result = $this->builder->where($column, $value);
return $this->builder; // The unmodified builder
}
/** @var Builder<TModelClass> $result */
return $result;
return $this->builder->where($column, $value);
}
/**
* Apply the sort type to the query.
*
* @return Builder<TModelClass>
*/
protected function sort(string $values): Builder
{
$result = $this->builder;
$sortables = array_map('trim', explode(',', $values));
foreach ($sortables as $sortable) {
@ -96,11 +66,10 @@ trait FilterMethods
$column = Str::of($sortable)->remove('-')->value();
if (in_array($column, $this->sortable)) {
$result = $this->builder->orderBy($column, $direction);
$this->builder->orderBy($column, $direction);
}
}
/** @var Builder<TModelClass> $result */
return $result;
return $this->builder;
}
}

View File

@ -33,8 +33,6 @@ class HomepageMods extends Component
/**
* Fetches the featured mods homepage listing.
*
* @return Collection<int, Mod>
*/
private function fetchFeaturedMods(): Collection
{
@ -54,8 +52,6 @@ class HomepageMods extends Component
/**
* Fetches the latest mods homepage listing.
*
* @return Collection<int, Mod>
*/
private function fetchLatestMods(): Collection
{
@ -74,8 +70,6 @@ class HomepageMods extends Component
/**
* Fetches the recently updated mods homepage listing.
*
* @return Collection<int, Mod>
*/
private function fetchUpdatedMods(): Collection
{