@@ -195,7 +195,7 @@ |
||
195 | 195 | * |
196 | 196 | * @return string |
197 | 197 | */ |
198 | - function (array $matches): string { |
|
198 | + function(array $matches): string { |
|
199 | 199 | return strtoupper($matches[1]); |
200 | 200 | }, |
201 | 201 | ucfirst($field) |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | $temp = array( |
93 | 93 | 'columns' => array(), |
94 | 94 | ); |
95 | - array_map(function () use ($filters, &$temp) { |
|
95 | + array_map(function() use ($filters, &$temp) { |
|
96 | 96 | $temp['columns'][] = array( |
97 | 97 | 'search' => array( |
98 | 98 | 'value' => $filters['search'][Column::GLOBAL_ALIAS], |
@@ -125,8 +125,7 @@ discard block |
||
125 | 125 | $temp = '('.$this->columns[$index]->where($query, $filter['search']['value']).')'; |
126 | 126 | |
127 | 127 | $this->columns[$index]->isHaving() ? |
128 | - $having .= (!empty($having) ? ' AND ' : '').$temp : |
|
129 | - $where .= (!empty($where) ? ' '.($this->globalSearch ? 'OR' : 'AND').' ' : '').$temp; |
|
128 | + $having .= (!empty($having) ? ' AND ' : '').$temp : $where .= (!empty($where) ? ' '.($this->globalSearch ? 'OR' : 'AND').' ' : '').$temp; |
|
130 | 129 | } |
131 | 130 | } |
132 | 131 | |
@@ -211,8 +210,7 @@ discard block |
||
211 | 210 | ->getScalarResult(); |
212 | 211 | |
213 | 212 | return !empty($result) ? |
214 | - (int) $result[0]['count'] : |
|
215 | - 0; |
|
213 | + (int) $result[0]['count'] : 0; |
|
216 | 214 | } |
217 | 215 | |
218 | 216 | /** |
@@ -239,8 +237,7 @@ discard block |
||
239 | 237 | } |
240 | 238 | |
241 | 239 | $conditions = isset($filters['columns']) ? |
242 | - $this->createCondition($query, $filters) : |
|
243 | - array(); |
|
240 | + $this->createCondition($query, $filters) : array(); |
|
244 | 241 | |
245 | 242 | if (isset($conditions['where']) && !empty($conditions['where'])) { |
246 | 243 | $query->andWhere($conditions['where']); |
@@ -310,11 +307,9 @@ discard block |
||
310 | 307 | $data = $this->limit($query, $filters)->result( |
311 | 308 | $query, |
312 | 309 | isset($filters['order']) ? |
313 | - $filters['order'][0]['column'] : |
|
314 | - 0, |
|
310 | + $filters['order'][0]['column'] : 0, |
|
315 | 311 | isset($filters['order']) ? |
316 | - $filters['order'][0]['dir'] : |
|
317 | - 'ASC' |
|
312 | + $filters['order'][0]['dir'] : 'ASC' |
|
318 | 313 | ); |
319 | 314 | |
320 | 315 | return array( |