View GitHub Repository module-core

Schedule Inspection
Subscribe
Passed
Push — feature/optimize ( fc7b3f...d14460 )
by Fu
03:40
created
Status
Category
Toggle Patches
Criteria/RequestCriteria.php 2 patches
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch 
@@ -166,8 +166,8 @@  discard block
 
 block discarded – undo
166 166 
                 }
167 167
168 168 
                 $this->model = $this->model->leftJoin($sortTable, $keyName, '=', $sortTable.'.id')
169 
-                                           ->orderBy($sortColumn, $this->sortedBy)
170 
-                                           ->addSelect($table.'.*');
169 
+                                            ->orderBy($sortColumn, $this->sortedBy)
170 
+                                            ->addSelect($table.'.*');
171 171 
             } else {
172 172 
                 $this->model = $this->model->orderBy($this->orderBy, $this->sortedBy);
173 173 
             }
 
@@ -274,17 +274,17 @@  discard block
 
 block discarded – undo
274 274 
                                 $query->where(function (Builder $query) use ($field, $value) {
275 275 
                                     $query->where(function (Builder $query) use ($field, $value) {
276 276 
                                         $query->where("{$field}_min", '<=', $value[0])
277 
-                                              ->where("{$field}_max", '>=', $value[1]);
277 
+                                                ->where("{$field}_max", '>=', $value[1]);
278 278 
                                     })->orWhere(function (Builder $query) use ($field, $value) {
279 279 
                                         $query->where("{$field}_min", '<=', $value[0])
280 
-                                              ->where("{$field}_max", '>=', $value[0]);
280 
+                                                ->where("{$field}_max", '>=', $value[0]);
281 281 
                                     })->orWhere(function (Builder $query) use ($field, $value) {
282 282 
                                         $query->where("{$field}_min", '>=', $value[0])
283 
-                                              ->where("{$field}_max", '<=', $value[1]);
283 
+                                                ->where("{$field}_max", '<=', $value[1]);
284 284 
                                     })->orWhere(function (Builder $query) use ($field, $value) {
285 285 
                                         $query->where("{$field}_min", '>=', $value[0])
286 
-                                              ->where("{$field}_max", '>=', $value[1])
287 
-                                              ->where("{$field}_min", '<=', $value[1]);
286 
+                                                ->where("{$field}_max", '>=', $value[1])
287 
+                                                ->where("{$field}_min", '<=', $value[1]);
288 288 
                                     });
289 289 
                                 });
290 290 
                                 break;
 
@@ -304,17 +304,17 @@  discard block
 
 block discarded – undo
304 304 
                         $this->model = $this->model->where(function (Builder $query) use ($field, $value) {
305 305 
                             $query->where(function (Builder $query) use ($field, $value) {
306 306 
                                 $query->where("{$field}_min", '<=', $value[0])
307 
-                                      ->where("{$field}_max", '>=', $value[1]);
307 
+                                        ->where("{$field}_max", '>=', $value[1]);
308 308 
                             })->orWhere(function (Builder $query) use ($field, $value) {
309 309 
                                 $query->where("{$field}_min", '<=', $value[0])
310 
-                                      ->where("{$field}_max", '>=', $value[0]);
310 
+                                        ->where("{$field}_max", '>=', $value[0]);
311 311 
                             })->orWhere(function (Builder $query) use ($field, $value) {
312 312 
                                 $query->where("{$field}_min", '>=', $value[0])
313 
-                                      ->where("{$field}_max", '<=', $value[1]);
313 
+                                        ->where("{$field}_max", '<=', $value[1]);
314 314 
                             })->orWhere(function (Builder $query) use ($field, $value) {
315 315 
                                 $query->where("{$field}_min", '>=', $value[0])
316 
-                                      ->where("{$field}_max", '>=', $value[1])
317 
-                                      ->where("{$field}_min", '<=', $value[1]);
316 
+                                        ->where("{$field}_max", '>=', $value[1])
317 
+                                        ->where("{$field}_min", '<=', $value[1]);
318 318 
                             });
319 319 
                         });
320 320 
                         break;
 
@@ -344,17 +344,17 @@  discard block
 
 block discarded – undo
344 344 
                         $query->where(function (Builder $query) use ($field, $value) {
345 345 
                             $query->where(function (Builder $query) use ($field, $value) {
346 346 
                                 $query->where("{$field}_min", '<=', $value[0])
347 
-                                      ->where("{$field}_max", '>=', $value[1]);
347 
+                                        ->where("{$field}_max", '>=', $value[1]);
348 348 
                             })->orWhere(function (Builder $query) use ($field, $value) {
349 349 
                                 $query->where("{$field}_min", '<=', $value[0])
350 
-                                      ->where("{$field}_max", '>=', $value[0]);
350 
+                                        ->where("{$field}_max", '>=', $value[0]);
351 351 
                             })->orWhere(function (Builder $query) use ($field, $value) {
352 352 
                                 $query->where("{$field}_min", '>=', $value[0])
353 
-                                      ->where("{$field}_max", '<=', $value[1]);
353 
+                                        ->where("{$field}_max", '<=', $value[1]);
354 354 
                             })->orWhere(function (Builder $query) use ($field, $value) {
355 355 
                                 $query->where("{$field}_min", '>=', $value[0])
356 
-                                      ->where("{$field}_max", '>=', $value[1])
357 
-                                      ->where("{$field}_min", '<=', $value[1]);
356 
+                                        ->where("{$field}_max", '>=', $value[1])
357 
+                                        ->where("{$field}_min", '<=', $value[1]);
358 358 
                             });
359 359 
                         });
360 360 
                     } else {
 
@@ -370,17 +370,17 @@  discard block
 
 block discarded – undo
370 370 
                     $this->model = $this->model->orWhere(function (Builder $query) use ($field, $value) {
371 371 
                         $query->where(function (Builder $query) use ($field, $value) {
372 372 
                             $query->where("{$field}_min", '<=', $value[0])
373 
-                                  ->where("{$field}_max", '>=', $value[1]);
373 
+                                    ->where("{$field}_max", '>=', $value[1]);
374 374 
                         })->orWhere(function (Builder $query) use ($field, $value) {
375 375 
                             $query->where("{$field}_min", '<=', $value[0])
376 
-                                  ->where("{$field}_max", '>=', $value[0]);
376 
+                                    ->where("{$field}_max", '>=', $value[0]);
377 377 
                         })->orWhere(function (Builder $query) use ($field, $value) {
378 378 
                             $query->where("{$field}_min", '>=', $value[0])
379 
-                                  ->where("{$field}_max", '<=', $value[1]);
379 
+                                    ->where("{$field}_max", '<=', $value[1]);
380 380 
                         })->orWhere(function (Builder $query) use ($field, $value) {
381 381 
                             $query->where("{$field}_min", '>=', $value[0])
382 
-                                  ->where("{$field}_max", '>=', $value[1])
383 
-                                  ->where("{$field}_min", '<=', $value[1]);
382 
+                                    ->where("{$field}_max", '>=', $value[1])
383 
+                                    ->where("{$field}_min", '<=', $value[1]);
384 384 
                         });
385 385 
                     });
386 386 
                 } else {
Please login to merge, or discard this patch.
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch 
@@ -262,7 +262,7 @@  discard block
 
 block discarded – undo
262 262 
         if (!is_null($value)) {
263 263 
             if (!is_null($relation)) {
264 264 
                 $this->model =
265 
-                    $this->model->whereHas($relation, function (Builder $query) use ($field, $condition, $value) {
265 
+                    $this->model->whereHas($relation, function(Builder $query) use ($field, $condition, $value) {
266 266 
                         switch ($condition) {
267 267 
                             case 'in':
268 268 
                                 $query->whereIn($field, $value);
 
@@ -271,17 +271,17 @@  discard block
 
 block discarded – undo
271 271 
                                 $query->whereBetween($field, $value);
272 272 
                                 break;
273 273 
                             case 'cross':
274 
-                                $query->where(function (Builder $query) use ($field, $value) {
275 
-                                    $query->where(function (Builder $query) use ($field, $value) {
274 
+                                $query->where(function(Builder $query) use ($field, $value) {
275 
+                                    $query->where(function(Builder $query) use ($field, $value) {
276 276 
                                         $query->where("{$field}_min", '<=', $value[0])
277 277 
                                               ->where("{$field}_max", '>=', $value[1]);
278 
-                                    })->orWhere(function (Builder $query) use ($field, $value) {
278 
+                                    })->orWhere(function(Builder $query) use ($field, $value) {
279 279 
                                         $query->where("{$field}_min", '<=', $value[0])
280 280 
                                               ->where("{$field}_max", '>=', $value[0]);
281 
-                                    })->orWhere(function (Builder $query) use ($field, $value) {
281 
+                                    })->orWhere(function(Builder $query) use ($field, $value) {
282 282 
                                         $query->where("{$field}_min", '>=', $value[0])
283 283 
                                               ->where("{$field}_max", '<=', $value[1]);
284 
-                                    })->orWhere(function (Builder $query) use ($field, $value) {
284 
+                                    })->orWhere(function(Builder $query) use ($field, $value) {
285 285 
                                         $query->where("{$field}_min", '>=', $value[0])
286 286 
                                               ->where("{$field}_max", '>=', $value[1])
287 287 
                                               ->where("{$field}_min", '<=', $value[1]);
 
@@ -301,17 +301,17 @@  discard block
 
 block discarded – undo
301 301 
                         $this->model = $this->model->whereBetween($field, $value);
302 302 
                         break;
303 303 
                     case 'cross':
304 
-                        $this->model = $this->model->where(function (Builder $query) use ($field, $value) {
305 
-                            $query->where(function (Builder $query) use ($field, $value) {
304 
+                        $this->model = $this->model->where(function(Builder $query) use ($field, $value) {
305 
+                            $query->where(function(Builder $query) use ($field, $value) {
306 306 
                                 $query->where("{$field}_min", '<=', $value[0])
307 307 
                                       ->where("{$field}_max", '>=', $value[1]);
308 
-                            })->orWhere(function (Builder $query) use ($field, $value) {
308 
+                            })->orWhere(function(Builder $query) use ($field, $value) {
309 309 
                                 $query->where("{$field}_min", '<=', $value[0])
310 310 
                                       ->where("{$field}_max", '>=', $value[0]);
311 
-                            })->orWhere(function (Builder $query) use ($field, $value) {
311 
+                            })->orWhere(function(Builder $query) use ($field, $value) {
312 312 
                                 $query->where("{$field}_min", '>=', $value[0])
313 313 
                                       ->where("{$field}_max", '<=', $value[1]);
314 
-                            })->orWhere(function (Builder $query) use ($field, $value) {
314 
+                            })->orWhere(function(Builder $query) use ($field, $value) {
315 315 
                                 $query->where("{$field}_min", '>=', $value[0])
316 316 
                                       ->where("{$field}_max", '>=', $value[1])
317 317 
                                       ->where("{$field}_min", '<=', $value[1]);
 
@@ -331,7 +331,7 @@  discard block
 
 block discarded – undo
331 331 
         $modelTableName = $this->model->getModel()->getTable();
332 332 
         if (!is_null($value)) {
333 333 
             if (!is_null($relation)) {
334 
-                $this->model = $this->model->orWhereHas($relation, function (Builder $query) use (
334 
+                $this->model = $this->model->orWhereHas($relation, function(Builder $query) use (
335 335 
                     $field,
336 336 
                     $condition,
337 337 
                     $value
 
@@ -341,17 +341,17 @@  discard block
 
 block discarded – undo
341 341 
                     } elseif ($condition == 'between') {
342 342 
                         $query->whereBetween($field, $value);
343 343 
                     } elseif ($condition == 'cross') {
344 
-                        $query->where(function (Builder $query) use ($field, $value) {
345 
-                            $query->where(function (Builder $query) use ($field, $value) {
344 
+                        $query->where(function(Builder $query) use ($field, $value) {
345 
+                            $query->where(function(Builder $query) use ($field, $value) {
346 346 
                                 $query->where("{$field}_min", '<=', $value[0])
347 347 
                                       ->where("{$field}_max", '>=', $value[1]);
348 
-                            })->orWhere(function (Builder $query) use ($field, $value) {
348 
+                            })->orWhere(function(Builder $query) use ($field, $value) {
349 349 
                                 $query->where("{$field}_min", '<=', $value[0])
350 350 
                                       ->where("{$field}_max", '>=', $value[0]);
351 
-                            })->orWhere(function (Builder $query) use ($field, $value) {
351 
+                            })->orWhere(function(Builder $query) use ($field, $value) {
352 352 
                                 $query->where("{$field}_min", '>=', $value[0])
353 353 
                                       ->where("{$field}_max", '<=', $value[1]);
354 
-                            })->orWhere(function (Builder $query) use ($field, $value) {
354 
+                            })->orWhere(function(Builder $query) use ($field, $value) {
355 355 
                                 $query->where("{$field}_min", '>=', $value[0])
356 356 
                                       ->where("{$field}_max", '>=', $value[1])
357 357 
                                       ->where("{$field}_min", '<=', $value[1]);
 
@@ -367,17 +367,17 @@  discard block
 
 block discarded – undo
367 367 
                 } elseif ($condition == 'between') {
368 368 
                     $this->model = $this->model->orWhereBetween($modelTableName.'.'.$field, $value);
369 369 
                 } elseif ($condition == 'cross') {
370 
-                    $this->model = $this->model->orWhere(function (Builder $query) use ($field, $value) {
371 
-                        $query->where(function (Builder $query) use ($field, $value) {
370 
+                    $this->model = $this->model->orWhere(function(Builder $query) use ($field, $value) {
371 
+                        $query->where(function(Builder $query) use ($field, $value) {
372 372 
                             $query->where("{$field}_min", '<=', $value[0])
373 373 
                                   ->where("{$field}_max", '>=', $value[1]);
374 
-                        })->orWhere(function (Builder $query) use ($field, $value) {
374 
+                        })->orWhere(function(Builder $query) use ($field, $value) {
375 375 
                             $query->where("{$field}_min", '<=', $value[0])
376 376 
                                   ->where("{$field}_max", '>=', $value[0]);
377 
-                        })->orWhere(function (Builder $query) use ($field, $value) {
377 
+                        })->orWhere(function(Builder $query) use ($field, $value) {
378 378 
                             $query->where("{$field}_min", '>=', $value[0])
379 379 
                                   ->where("{$field}_max", '<=', $value[1]);
380 
-                        })->orWhere(function (Builder $query) use ($field, $value) {
380 
+                        })->orWhere(function(Builder $query) use ($field, $value) {
381 381 
                             $query->where("{$field}_min", '>=', $value[0])
382 382 
                                   ->where("{$field}_max", '>=', $value[1])
383 383 
                                   ->where("{$field}_min", '<=', $value[1]);
Please login to merge, or discard this patch.