@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | $temp = array( |
| 92 | 92 | 'columns' => array(), |
| 93 | 93 | ); |
| 94 | - array_map(function () use ($filters, &$temp) { |
|
| 94 | + array_map(function() use ($filters, &$temp) { |
|
| 95 | 95 | $temp['columns'][] = array( |
| 96 | 96 | 'search' => array( |
| 97 | 97 | 'value' => $filters['search'][Column::GLOBAL_ALIAS], |
@@ -230,8 +230,7 @@ discard block |
||
| 230 | 230 | ->getScalarResult(); |
| 231 | 231 | |
| 232 | 232 | return !empty($result) ? |
| 233 | - (int) $result[0]['count'] : |
|
| 234 | - 0; |
|
| 233 | + (int) $result[0]['count'] : 0; |
|
| 235 | 234 | } |
| 236 | 235 | |
| 237 | 236 | /** |
@@ -258,20 +257,17 @@ discard block |
||
| 258 | 257 | } |
| 259 | 258 | |
| 260 | 259 | $temp = isset($filters['columns']) ? |
| 261 | - $this->createWherePart($query, $filters) : |
|
| 262 | - ''; |
|
| 260 | + $this->createWherePart($query, $filters) : ''; |
|
| 263 | 261 | |
| 264 | 262 | $having = isset($filters['columns']) ? |
| 265 | - $this->createHavingPart($query, $filters) : |
|
| 266 | - ''; |
|
| 263 | + $this->createHavingPart($query, $filters) : ''; |
|
| 267 | 264 | |
| 268 | 265 | if (!empty($temp)) { |
| 269 | 266 | $query->andWhere($temp); |
| 270 | 267 | } |
| 271 | 268 | |
| 272 | 269 | return !empty($having) ? |
| 273 | - $query->andHaving($having) : |
|
| 274 | - $query; |
|
| 270 | + $query->andHaving($having) : $query; |
|
| 275 | 271 | } |
| 276 | 272 | |
| 277 | 273 | /** |
@@ -331,11 +327,9 @@ discard block |
||
| 331 | 327 | $data = $this->limit($query, $filters)->result( |
| 332 | 328 | $query, |
| 333 | 329 | isset($filters['order']) ? |
| 334 | - $filters['order'][0]['column'] : |
|
| 335 | - 0, |
|
| 330 | + $filters['order'][0]['column'] : 0, |
|
| 336 | 331 | isset($filters['order']) ? |
| 337 | - $filters['order'][0]['dir'] : |
|
| 338 | - 'ASC' |
|
| 332 | + $filters['order'][0]['dir'] : 'ASC' |
|
| 339 | 333 | ); |
| 340 | 334 | |
| 341 | 335 | return array( |