@@ -15,7 +15,7 @@ |
||
15 | 15 | */ |
16 | 16 | public function boot() |
17 | 17 | { |
18 | - $this->app[EngineManager::class]->extend('tntsearch', function ($app) { |
|
18 | + $this->app[EngineManager::class]->extend('tntsearch', function($app) { |
|
19 | 19 | $tnt = new TNTSearch(); |
20 | 20 | |
21 | 21 | $driver = config('database.default'); |
@@ -43,6 +43,9 @@ discard block |
||
43 | 43 | }); |
44 | 44 | } |
45 | 45 | |
46 | + /** |
|
47 | + * @param TNTSearch $tnt |
|
48 | + */ |
|
46 | 49 | protected function setFuzziness($tnt) |
47 | 50 | { |
48 | 51 | $tnt->fuzziness = config('scout.tntsearch.fuzziness', $tnt->fuzziness); |
@@ -51,6 +54,9 @@ discard block |
||
51 | 54 | $tnt->fuzzy_max_expansions = config('scout.tntsearch.fuzzy.max_expansions', $tnt->fuzzy_max_expansions); |
52 | 55 | } |
53 | 56 | |
57 | + /** |
|
58 | + * @param TNTSearch $tnt |
|
59 | + */ |
|
54 | 60 | protected function setAsYouType($tnt) |
55 | 61 | { |
56 | 62 | $tnt->asYouType = config('scout.tntsearch.asYouType', $tnt->asYouType); |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | $index->setPrimaryKey($models->first()->getKeyName()); |
55 | 55 | |
56 | 56 | $index->indexBeginTransaction(); |
57 | - $models->each(function ($model) use ($index) { |
|
57 | + $models->each(function($model) use ($index) { |
|
58 | 58 | $array = $model->toSearchableArray(); |
59 | 59 | |
60 | 60 | if (empty($array)) { |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | public function delete($models) |
81 | 81 | { |
82 | 82 | $this->initIndex($models->first()); |
83 | - $models->each(function ($model) { |
|
83 | + $models->each(function($model) { |
|
84 | 84 | $this->tnt->selectIndex("{$model->searchableAs()}.index"); |
85 | 85 | $index = $this->tnt->getIndex(); |
86 | 86 | $index->setPrimaryKey($model->getKeyName()); |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | |
193 | 193 | $builder = $this->getBuilder($model); |
194 | 194 | |
195 | - if($this->builder->queryCallback){ |
|
195 | + if ($this->builder->queryCallback) { |
|
196 | 196 | call_user_func($this->builder->queryCallback, $builder); |
197 | 197 | } |
198 | 198 | |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | } |
207 | 207 | |
208 | 208 | // sort models by tnt search result set |
209 | - return collect($results['ids'])->map(function ($hit) use ($models) { |
|
209 | + return collect($results['ids'])->map(function($hit) use ($models) { |
|
210 | 210 | if (isset($models[$hit])) { |
211 | 211 | return $models[$hit]; |
212 | 212 | } |
@@ -290,8 +290,8 @@ discard block |
||
290 | 290 | */ |
291 | 291 | private function discardIdsFromResultSetByConstraints($builder, $searchResults) |
292 | 292 | { |
293 | - $qualifiedKeyName = $builder->model->getQualifiedKeyName(); // tableName.id |
|
294 | - $subQualifiedKeyName = 'sub.' . $builder->model->getKeyName(); // sub.id |
|
293 | + $qualifiedKeyName = $builder->model->getQualifiedKeyName(); // tableName.id |
|
294 | + $subQualifiedKeyName = 'sub.'.$builder->model->getKeyName(); // sub.id |
|
295 | 295 | |
296 | 296 | $sub = $this->getBuilder($builder->model)->whereIn( |
297 | 297 | $qualifiedKeyName, $searchResults |
@@ -299,7 +299,7 @@ discard block |
||
299 | 299 | |
300 | 300 | $discardIds = $builder->model->newQuery() |
301 | 301 | ->select($qualifiedKeyName) |
302 | - ->leftJoin(DB::raw('(' . $sub->getQuery()->toSql() .') as sub'), $subQualifiedKeyName, '=', $qualifiedKeyName) |
|
302 | + ->leftJoin(DB::raw('('.$sub->getQuery()->toSql().') as sub'), $subQualifiedKeyName, '=', $qualifiedKeyName) |
|
303 | 303 | ->addBinding($sub->getQuery()->getBindings(), 'join') |
304 | 304 | ->whereIn($qualifiedKeyName, $searchResults) |
305 | 305 | ->whereNull($subQualifiedKeyName) |
@@ -370,10 +370,10 @@ discard block |
||
370 | 370 | private function applyWheres($builder) |
371 | 371 | { |
372 | 372 | // iterate over given where clauses |
373 | - return collect($this->builder->wheres)->map(function ($value, $key) { |
|
373 | + return collect($this->builder->wheres)->map(function($value, $key) { |
|
374 | 374 | // for reduce function combine key and value into array |
375 | 375 | return [$key, $value]; |
376 | - })->reduce(function ($builder, $where) { |
|
376 | + })->reduce(function($builder, $where) { |
|
377 | 377 | // separate key, value again |
378 | 378 | list($key, $value) = $where; |
379 | 379 | return $builder->where($key, $value); |
@@ -389,10 +389,10 @@ discard block |
||
389 | 389 | private function applyOrders($builder) |
390 | 390 | { |
391 | 391 | //iterate over given orderBy clauses - should be only one |
392 | - return collect($this->builder->orders)->map(function ($value, $key) { |
|
392 | + return collect($this->builder->orders)->map(function($value, $key) { |
|
393 | 393 | // for reduce function combine key and value into array |
394 | 394 | return [$value["column"], $value["direction"]]; |
395 | - })->reduce(function ($builder, $orderBy) { |
|
395 | + })->reduce(function($builder, $orderBy) { |
|
396 | 396 | // separate key, value again |
397 | 397 | list($column, $direction) = $orderBy; |
398 | 398 | return $builder->orderBy($column, $direction); |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | * |
215 | 215 | * @param \Illuminate\Database\Eloquent\Model $model |
216 | 216 | * |
217 | - * @return Builder |
|
217 | + * @return \Illuminate\Support\Collection |
|
218 | 218 | */ |
219 | 219 | public function getBuilder($model) |
220 | 220 | { |
@@ -278,6 +278,7 @@ discard block |
||
278 | 278 | * The constraints usually remove only a small amount of results, which is why the non |
279 | 279 | * matching results are looked up and removed, instead of returning a collection with |
280 | 280 | * all the valid results. |
281 | + * @param Builder $builder |
|
281 | 282 | */ |
282 | 283 | private function discardIdsFromResultSetByConstraints($builder, $searchResults) |
283 | 284 | { |
@@ -227,7 +227,7 @@ |
||
227 | 227 | |
228 | 228 | $builder = $this->applyOrders($builder); |
229 | 229 | |
230 | - return $builder; |
|
230 | + return $builder; |
|
231 | 231 | } |
232 | 232 | |
233 | 233 | /** |