Skip to content

Fixes for HasTags.php - PHP 8.4 implicit nullable type declaration #525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 30, 2024
Merged

Fixes for HasTags.php - PHP 8.4 implicit nullable type declaration #525

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
860569a
Change the implicit nullable type declaration to a nullable type decl…
idealerror Dec 28, 2024
9561eb8
Merge pull request #1 from idealerror/php84-implicit-nullable
idealerror Dec 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/HasTags.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public function setTagsAttribute(string | array | ArrayAccess | Tag $tags)
public function scopeWithAllTags(
Builder $query,
string | array | ArrayAccess | Tag $tags,
string $type = null,
?string $type = null,
): Builder {
$tags = static::convertToTags($tags, $type);

Expand All @@ -105,7 +105,7 @@ public function scopeWithAllTags(
public function scopeWithAnyTags(
Builder $query,
string | array | ArrayAccess | Tag $tags,
string $type = null,
?string $type = null,
): Builder {
$tags = static::convertToTags($tags, $type);

Expand All @@ -120,7 +120,7 @@ public function scopeWithAnyTags(
public function scopeWithoutTags(
Builder $query,
string | array | ArrayAccess | Tag $tags,
string $type = null
?string $type = null
): Builder {
$tags = static::convertToTags($tags, $type);

Expand Down Expand Up @@ -159,12 +159,12 @@ public function scopeWithAnyTagsOfAnyType(Builder $query, $tags): Builder
);
}

public function tagsWithType(string $type = null): Collection
public function tagsWithType(?string $type = null): Collection
{
return $this->tags->filter(fn (Tag $tag) => $tag->type === $type);
}

public function attachTags(array | ArrayAccess | Tag $tags, string $type = null): static
public function attachTags(array | ArrayAccess | Tag $tags, ?string $type = null): static
{
$className = static::getTagClassName();

Expand Down Expand Up @@ -300,7 +300,7 @@ protected function syncTagIds($ids, string | null $type = null, $detaching = tru
}
}

public function hasTag($tag, string $type = null): bool
public function hasTag($tag, ?string $type = null): bool
{
return $this->tags
->when($type !== null, fn ($query) => $query->where('type', $type))
Expand Down
Loading