Skip to content

Commit a669796

Browse files
committed
wip
1 parent 37988ec commit a669796

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

phpstan.neon

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,4 @@ parameters:
99
# The level 8 is the highest level
1010
level: 5
1111

12-
ignoreErrors:
13-
- '#Unsafe usage of new static#'
14-
1512
checkMissingIterableValueType: false

src/UnionBuilder.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ public static function search(string $searchQuery, array $models)
8282
$columns = null;
8383
}
8484

85-
if (! in_array(Searchable::class, class_uses($model))) {
86-
throw new Exception("Model '${model}' does not use Laravel Scout.");
85+
if (! class_exists($model) || ! in_array(Searchable::class, class_uses($model))) {
86+
throw new Exception("Model '${model}' is invalid.");
8787
}
8888

8989
$modelSearchResultKeys = $model::search($searchQuery)->keys();
@@ -145,7 +145,7 @@ private function getUnionBuilder()
145145

146146
$builder->select($selectColumnsArr);
147147

148-
$unitedBaseBuilder = is_null($unitedBaseBuilder) ? $builder->toBase() : $unitedBaseBuilder->union($builder);
148+
$unitedBaseBuilder = is_null($unitedBaseBuilder) ? $builder->toBase() : $unitedBaseBuilder->union($builder->toBase());
149149
}
150150

151151
if (! $unitedBaseBuilder) {

0 commit comments

Comments
 (0)