Commit 6142f80f authored by Micheal Mand's avatar Micheal Mand

Use array_wrap as a shorthand for checking for strings

parent 88ae3c83
...@@ -23,12 +23,9 @@ trait TaggableTrait ...@@ -23,12 +23,9 @@ trait TaggableTrait
public function scopeWhereTag(Builder $query, $tags, string $type = 'slug'): Builder public function scopeWhereTag(Builder $query, $tags, string $type = 'slug'): Builder
{ {
if (is_string($tags) === true) {
$tags = [$tags];
}
$query->with('translations'); $query->with('translations');
foreach ($tags as $tag) { foreach (array_wrap($tags) as $tag) {
$query->whereHas('tags', function (Builder $query) use ($type, $tag) { $query->whereHas('tags', function (Builder $query) use ($type, $tag) {
$query->whereHas('translations', function (Builder $query) use ($type, $tag) { $query->whereHas('translations', function (Builder $query) use ($type, $tag) {
$query->where($type, $tag); $query->where($type, $tag);
...@@ -41,9 +38,8 @@ trait TaggableTrait ...@@ -41,9 +38,8 @@ trait TaggableTrait
public function scopeWithTag(Builder $query, $tags, string $type = 'slug'): Builder public function scopeWithTag(Builder $query, $tags, string $type = 'slug'): Builder
{ {
if (is_string($tags) === true) { $tags = array_wrap($tags);
$tags = [$tags];
}
$query->with('translations'); $query->with('translations');
return $query->whereHas('tags', function (Builder $query) use ($type, $tags) { return $query->whereHas('tags', function (Builder $query) use ($type, $tags) {
...@@ -98,7 +94,7 @@ trait TaggableTrait ...@@ -98,7 +94,7 @@ trait TaggableTrait
public function tag($tags): bool public function tag($tags): bool
{ {
foreach ($tags as $tag) { foreach (array_wrap($tags) as $tag) {
$this->addTag($tag); $this->addTag($tag);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment