@@ -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); |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | $index->setPrimaryKey($models->first()->getKeyName()); |
47 | 47 | |
48 | 48 | $index->indexBeginTransaction(); |
49 | - $models->each(function ($model) use ($index) { |
|
49 | + $models->each(function($model) use ($index) { |
|
50 | 50 | $array = $model->toSearchableArray(); |
51 | 51 | |
52 | 52 | if (empty($array)) { |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | public function delete($models) |
73 | 73 | { |
74 | 74 | $this->initIndex($models->first()); |
75 | - $models->each(function ($model) { |
|
75 | + $models->each(function($model) { |
|
76 | 76 | $this->tnt->selectIndex("{$model->searchableAs()}.index"); |
77 | 77 | $index = $this->tnt->getIndex(); |
78 | 78 | $index->setPrimaryKey($model->getKeyName()); |
@@ -115,8 +115,8 @@ discard block |
||
115 | 115 | |
116 | 116 | $searchResults = $results['ids']; |
117 | 117 | |
118 | - $qualifiedKeyName = $builder->model->getQualifiedKeyName(); // tableName.id |
|
119 | - $subQualifiedKeyName = 'sub.' . $builder->model->getKeyName(); // sub.id |
|
118 | + $qualifiedKeyName = $builder->model->getQualifiedKeyName(); // tableName.id |
|
119 | + $subQualifiedKeyName = 'sub.'.$builder->model->getKeyName(); // sub.id |
|
120 | 120 | |
121 | 121 | $sub = $this->getBuilder($builder->model)->whereIn( |
122 | 122 | $qualifiedKeyName, $searchResults |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | */ |
140 | 140 | $discardIds = $builder->model->newQuery() |
141 | 141 | ->select($qualifiedKeyName) |
142 | - ->leftJoin(DB::raw('(' . $sub->getQuery()->toSql() .') as sub'), $subQualifiedKeyName, '=', $qualifiedKeyName) |
|
142 | + ->leftJoin(DB::raw('('.$sub->getQuery()->toSql().') as sub'), $subQualifiedKeyName, '=', $qualifiedKeyName) |
|
143 | 143 | ->whereIn($qualifiedKeyName, $searchResults) |
144 | 144 | ->whereNull($subQualifiedKeyName) |
145 | 145 | ->pluck($builder->model->getKeyName()); |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | */ |
208 | 208 | protected function filters(Builder $builder) |
209 | 209 | { |
210 | - return collect($builder->wheres)->map(function ($value, $key) { |
|
210 | + return collect($builder->wheres)->map(function($value, $key) { |
|
211 | 211 | return $key.'='.$value; |
212 | 212 | })->values()->all(); |
213 | 213 | } |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | } |
241 | 241 | |
242 | 242 | // sort models by tnt search result set |
243 | - return collect($results['ids'])->map(function ($hit) use ($models) { |
|
243 | + return collect($results['ids'])->map(function($hit) use ($models) { |
|
244 | 244 | if (isset($models[$hit])) { |
245 | 245 | return $models[$hit]; |
246 | 246 | } |
@@ -261,20 +261,20 @@ discard block |
||
261 | 261 | $builder = isset($this->builder->constraints) ? $this->builder->constraints : $model->newQuery(); |
262 | 262 | |
263 | 263 | // iterate over given where clauses |
264 | - $builder = collect($this->builder->wheres)->map(function ($value, $key) { |
|
264 | + $builder = collect($this->builder->wheres)->map(function($value, $key) { |
|
265 | 265 | // for reduce function combine key and value into array |
266 | 266 | return [$key, $value]; |
267 | - })->reduce(function ($builder, $where) { |
|
267 | + })->reduce(function($builder, $where) { |
|
268 | 268 | // separate key, value again |
269 | 269 | list($key, $value) = $where; |
270 | 270 | return $builder->where($key, $value); |
271 | 271 | }, $builder); |
272 | 272 | |
273 | 273 | //iterate over given orderBy clauses - should be only one |
274 | - return collect($this->builder->orders)->map(function ($value, $key) { |
|
274 | + return collect($this->builder->orders)->map(function($value, $key) { |
|
275 | 275 | // for reduce function combine key and value into array |
276 | 276 | return [$value["column"], $value["direction"]]; |
277 | - })->reduce(function ($builder, $orderBy) { |
|
277 | + })->reduce(function($builder, $orderBy) { |
|
278 | 278 | // separate key, value again |
279 | 279 | list($column, $direction) = $orderBy; |
280 | 280 | return $builder->orderBy($column, $direction); |