@@ -131,7 +131,7 @@ |
||
131 | 131 | * Для удобства используй готовые методы фильтрации: where(), whereIn(), whereBetween(), whereMatch() |
132 | 132 | * whereLess() и другие методы where*() |
133 | 133 | * |
134 | - * @param $type - тип фильтрации (term|terms|match|range) |
|
134 | + * @param string $type - тип фильтрации (term|terms|match|range) |
|
135 | 135 | * @param $filter - сам фильтр |
136 | 136 | * @link https://www.elastic.co/guide/en/elasticsearch/reference/5.0/query-dsl-terms-query.html |
137 | 137 | * @return $this |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | * Параметры запроса |
15 | 15 | * @var array |
16 | 16 | */ |
17 | - protected $params=[]; |
|
17 | + protected $params = []; |
|
18 | 18 | |
19 | 19 | /** |
20 | 20 | * сколько всего в индексе ES строк удовлетворяющих параметрам поиска |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | */ |
139 | 139 | public function addFilter($type, $filter) |
140 | 140 | { |
141 | - if ( !isset($this->params['body']['query']['bool']['must']) ) { |
|
141 | + if (!isset($this->params['body']['query']['bool']['must'])) { |
|
142 | 142 | $this->params['body']['query']['bool']['must'] = []; |
143 | 143 | } |
144 | 144 | |
@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | if ($dateFormat) { |
202 | 202 | $params['format'] = $dateFormat; |
203 | 203 | } |
204 | - $this->addFilter('range',[$field => $params]); |
|
204 | + $this->addFilter('range', [$field => $params]); |
|
205 | 205 | return $this; |
206 | 206 | } |
207 | 207 |
@@ -321,8 +321,7 @@ discard block |
||
321 | 321 | 'query' => $text, |
322 | 322 | 'fields' => $field |
323 | 323 | ]); |
324 | - } |
|
325 | - else { |
|
324 | + } else { |
|
326 | 325 | $this->addFilter('match', [$field => $text]); |
327 | 326 | } |
328 | 327 | return $this; |
@@ -431,8 +430,7 @@ discard block |
||
431 | 430 | foreach ($hit['fields'] as $field => $data) { |
432 | 431 | if (count($data) == 1) { |
433 | 432 | $row[$field] = array_shift($data); |
434 | - } |
|
435 | - else { |
|
433 | + } else { |
|
436 | 434 | $row[$field] = $data; |
437 | 435 | } |
438 | 436 | } |
@@ -455,8 +453,7 @@ discard block |
||
455 | 453 | $results = $this->fetchAll(); |
456 | 454 | if (count($results)) { |
457 | 455 | return array_shift($results); |
458 | - } |
|
459 | - else { |
|
456 | + } else { |
|
460 | 457 | return null; |
461 | 458 | } |
462 | 459 | } |