View GitHub Repository module-core

Schedule Inspection
Subscribe
Passed
Push — feature/optimize ( d14460...219eef )
by Fu
03:23
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 
             }
 
@@ -339,17 +339,17 @@  discard block
 
 block discarded – undo
339 339 
                         $query->where(function (Builder $query) use ($field, $value) {
340 340 
                             $query->where(function (Builder $query) use ($field, $value) {
341 341 
                                 $query->where("{$field}_min", '<=', $value[0])
342 
-                                      ->where("{$field}_max", '>=', $value[1]);
342 
+                                        ->where("{$field}_max", '>=', $value[1]);
343 343 
                             })->orWhere(function (Builder $query) use ($field, $value) {
344 344 
                                 $query->where("{$field}_min", '<=', $value[0])
345 
-                                      ->where("{$field}_max", '>=', $value[0]);
345 
+                                        ->where("{$field}_max", '>=', $value[0]);
346 346 
                             })->orWhere(function (Builder $query) use ($field, $value) {
347 347 
                                 $query->where("{$field}_min", '>=', $value[0])
348 
-                                      ->where("{$field}_max", '<=', $value[1]);
348 
+                                        ->where("{$field}_max", '<=', $value[1]);
349 349 
                             })->orWhere(function (Builder $query) use ($field, $value) {
350 350 
                                 $query->where("{$field}_min", '>=', $value[0])
351 
-                                      ->where("{$field}_max", '>=', $value[1])
352 
-                                      ->where("{$field}_min", '<=', $value[1]);
351 
+                                        ->where("{$field}_max", '>=', $value[1])
352 
+                                        ->where("{$field}_min", '<=', $value[1]);
353 353 
                             });
354 354 
                         });
355 355 
                         break;
 
@@ -372,17 +372,17 @@  discard block
 
 block discarded – undo
372 372 
                 $this->model = $this->model->where(function (Builder $query) use ($field, $value) {
373 373 
                     $query->where(function (Builder $query) use ($field, $value) {
374 374 
                         $query->where("{$field}_min", '<=', $value[0])
375 
-                              ->where("{$field}_max", '>=', $value[1]);
375 
+                                ->where("{$field}_max", '>=', $value[1]);
376 376 
                     })->orWhere(function (Builder $query) use ($field, $value) {
377 377 
                         $query->where("{$field}_min", '<=', $value[0])
378 
-                              ->where("{$field}_max", '>=', $value[0]);
378 
+                                ->where("{$field}_max", '>=', $value[0]);
379 379 
                     })->orWhere(function (Builder $query) use ($field, $value) {
380 380 
                         $query->where("{$field}_min", '>=', $value[0])
381 
-                              ->where("{$field}_max", '<=', $value[1]);
381 
+                                ->where("{$field}_max", '<=', $value[1]);
382 382 
                     })->orWhere(function (Builder $query) use ($field, $value) {
383 383 
                         $query->where("{$field}_min", '>=', $value[0])
384 
-                              ->where("{$field}_max", '>=', $value[1])
385 
-                              ->where("{$field}_min", '<=', $value[1]);
384 
+                                ->where("{$field}_max", '>=', $value[1])
385 
+                                ->where("{$field}_min", '<=', $value[1]);
386 386 
                     });
387 387 
                 });
388 388 
                 break;
 
@@ -405,17 +405,17 @@  discard block
 
 block discarded – undo
405 405 
                     $query->where(function (Builder $query) use ($field, $value) {
406 406 
                         $query->where(function (Builder $query) use ($field, $value) {
407 407 
                             $query->where("{$field}_min", '<=', $value[0])
408 
-                                  ->where("{$field}_max", '>=', $value[1]);
408 
+                                    ->where("{$field}_max", '>=', $value[1]);
409 409 
                         })->orWhere(function (Builder $query) use ($field, $value) {
410 410 
                             $query->where("{$field}_min", '<=', $value[0])
411 
-                                  ->where("{$field}_max", '>=', $value[0]);
411 
+                                    ->where("{$field}_max", '>=', $value[0]);
412 412 
                         })->orWhere(function (Builder $query) use ($field, $value) {
413 413 
                             $query->where("{$field}_min", '>=', $value[0])
414 
-                                  ->where("{$field}_max", '<=', $value[1]);
414 
+                                    ->where("{$field}_max", '<=', $value[1]);
415 415 
                         })->orWhere(function (Builder $query) use ($field, $value) {
416 416 
                             $query->where("{$field}_min", '>=', $value[0])
417 
-                                  ->where("{$field}_max", '>=', $value[1])
418 
-                                  ->where("{$field}_min", '<=', $value[1]);
417 
+                                    ->where("{$field}_max", '>=', $value[1])
418 
+                                    ->where("{$field}_min", '<=', $value[1]);
419 419 
                         });
420 420 
                     });
421 421 
                     break;
 
@@ -439,17 +439,17 @@  discard block
 
 block discarded – undo
439 439 
                 $this->model = $this->model->orWhere(function (Builder $query) use ($field, $value) {
440 440 
                     $query->where(function (Builder $query) use ($field, $value) {
441 441 
                         $query->where("{$field}_min", '<=', $value[0])
442 
-                              ->where("{$field}_max", '>=', $value[1]);
442 
+                                ->where("{$field}_max", '>=', $value[1]);
443 443 
                     })->orWhere(function (Builder $query) use ($field, $value) {
444 444 
                         $query->where("{$field}_min", '<=', $value[0])
445 
-                              ->where("{$field}_max", '>=', $value[0]);
445 
+                                ->where("{$field}_max", '>=', $value[0]);
446 446 
                     })->orWhere(function (Builder $query) use ($field, $value) {
447 447 
                         $query->where("{$field}_min", '>=', $value[0])
448 
-                              ->where("{$field}_max", '<=', $value[1]);
448 
+                                ->where("{$field}_max", '<=', $value[1]);
449 449 
                     })->orWhere(function (Builder $query) use ($field, $value) {
450 450 
                         $query->where("{$field}_min", '>=', $value[0])
451 
-                              ->where("{$field}_max", '>=', $value[1])
452 
-                              ->where("{$field}_min", '<=', $value[1]);
451 
+                                ->where("{$field}_max", '>=', $value[1])
452 
+                                ->where("{$field}_min", '<=', $value[1]);
453 453 
                     });
454 454 
                 });
455 455 
                 break;
Please login to merge, or discard this patch.
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch 
@@ -327,7 +327,7 @@  discard block
 
 block discarded – undo
327 327 
     protected function parserSearchAndRelationClosure($value, $relation, $field, $condition)
328 328 
     {
329 329 
         $this->model =
330 
-            $this->model->whereHas($relation, function (Builder $query) use ($field, $condition, $value) {
330 
+            $this->model->whereHas($relation, function(Builder $query) use ($field, $condition, $value) {
331 331 
                 switch ($condition) {
332 332 
                     case 'in':
333 333 
                         $query->whereIn($field, $value);
 
@@ -336,17 +336,17 @@  discard block
 
 block discarded – undo
336 336 
                         $query->whereBetween($field, $value);
337 337 
                         break;
338 338 
                     case 'cross':
339 
-                        $query->where(function (Builder $query) use ($field, $value) {
340 
-                            $query->where(function (Builder $query) use ($field, $value) {
339 
+                        $query->where(function(Builder $query) use ($field, $value) {
340 
+                            $query->where(function(Builder $query) use ($field, $value) {
341 341 
                                 $query->where("{$field}_min", '<=', $value[0])
342 342 
                                       ->where("{$field}_max", '>=', $value[1]);
343 
-                            })->orWhere(function (Builder $query) use ($field, $value) {
343 
+                            })->orWhere(function(Builder $query) use ($field, $value) {
344 344 
                                 $query->where("{$field}_min", '<=', $value[0])
345 345 
                                       ->where("{$field}_max", '>=', $value[0]);
346 
-                            })->orWhere(function (Builder $query) use ($field, $value) {
346 
+                            })->orWhere(function(Builder $query) use ($field, $value) {
347 347 
                                 $query->where("{$field}_min", '>=', $value[0])
348 348 
                                       ->where("{$field}_max", '<=', $value[1]);
349 
-                            })->orWhere(function (Builder $query) use ($field, $value) {
349 
+                            })->orWhere(function(Builder $query) use ($field, $value) {
350 350 
                                 $query->where("{$field}_min", '>=', $value[0])
351 351 
                                       ->where("{$field}_max", '>=', $value[1])
352 352 
                                       ->where("{$field}_min", '<=', $value[1]);
 
@@ -369,17 +369,17 @@  discard block
 
 block discarded – undo
369 369 
                 $this->model = $this->model->whereBetween($field, $value);
370 370 
                 break;
371 371 
             case 'cross':
372 
-                $this->model = $this->model->where(function (Builder $query) use ($field, $value) {
373 
-                    $query->where(function (Builder $query) use ($field, $value) {
372 
+                $this->model = $this->model->where(function(Builder $query) use ($field, $value) {
373 
+                    $query->where(function(Builder $query) use ($field, $value) {
374 374 
                         $query->where("{$field}_min", '<=', $value[0])
375 375 
                               ->where("{$field}_max", '>=', $value[1]);
376 
-                    })->orWhere(function (Builder $query) use ($field, $value) {
376 
+                    })->orWhere(function(Builder $query) use ($field, $value) {
377 377 
                         $query->where("{$field}_min", '<=', $value[0])
378 378 
                               ->where("{$field}_max", '>=', $value[0]);
379 
-                    })->orWhere(function (Builder $query) use ($field, $value) {
379 
+                    })->orWhere(function(Builder $query) use ($field, $value) {
380 380 
                         $query->where("{$field}_min", '>=', $value[0])
381 381 
                               ->where("{$field}_max", '<=', $value[1]);
382 
-                    })->orWhere(function (Builder $query) use ($field, $value) {
382 
+                    })->orWhere(function(Builder $query) use ($field, $value) {
383 383 
                         $query->where("{$field}_min", '>=', $value[0])
384 384 
                               ->where("{$field}_max", '>=', $value[1])
385 385 
                               ->where("{$field}_min", '<=', $value[1]);
 
@@ -393,7 +393,7 @@  discard block
 
 block discarded – undo
393 393
394 394 
     protected function parserSearchOrRelationClosure($value, $relation, $field, $condition)
395 395 
     {
396 
-        $this->model = $this->model->orWhereHas($relation, function (Builder $query) use ($field, $condition, $value) {
396 
+        $this->model = $this->model->orWhereHas($relation, function(Builder $query) use ($field, $condition, $value) {
397 397 
             switch ($condition) {
398 398 
                 case 'in':
399 399 
                     $query->whereIn($field, $value);
 
@@ -402,17 +402,17 @@  discard block
 
 block discarded – undo
402 402 
                     $query->whereBetween($field, $value);
403 403 
                     break;
404 404 
                 case 'cross':
405 
-                    $query->where(function (Builder $query) use ($field, $value) {
406 
-                        $query->where(function (Builder $query) use ($field, $value) {
405 
+                    $query->where(function(Builder $query) use ($field, $value) {
406 
+                        $query->where(function(Builder $query) use ($field, $value) {
407 407 
                             $query->where("{$field}_min", '<=', $value[0])
408 408 
                                   ->where("{$field}_max", '>=', $value[1]);
409 
-                        })->orWhere(function (Builder $query) use ($field, $value) {
409 
+                        })->orWhere(function(Builder $query) use ($field, $value) {
410 410 
                             $query->where("{$field}_min", '<=', $value[0])
411 411 
                                   ->where("{$field}_max", '>=', $value[0]);
412 
-                        })->orWhere(function (Builder $query) use ($field, $value) {
412 
+                        })->orWhere(function(Builder $query) use ($field, $value) {
413 413 
                             $query->where("{$field}_min", '>=', $value[0])
414 414 
                                   ->where("{$field}_max", '<=', $value[1]);
415 
-                        })->orWhere(function (Builder $query) use ($field, $value) {
415 
+                        })->orWhere(function(Builder $query) use ($field, $value) {
416 416 
                             $query->where("{$field}_min", '>=', $value[0])
417 417 
                                   ->where("{$field}_max", '>=', $value[1])
418 418 
                                   ->where("{$field}_min", '<=', $value[1]);
 
@@ -436,17 +436,17 @@  discard block
 
 block discarded – undo
436 436 
                 $this->model = $this->model->orWhereBetween($modelTableName.'.'.$field, $value);
437 437 
                 break;
438 438 
             case 'cross':
439 
-                $this->model = $this->model->orWhere(function (Builder $query) use ($field, $value) {
440 
-                    $query->where(function (Builder $query) use ($field, $value) {
439 
+                $this->model = $this->model->orWhere(function(Builder $query) use ($field, $value) {
440 
+                    $query->where(function(Builder $query) use ($field, $value) {
441 441 
                         $query->where("{$field}_min", '<=', $value[0])
442 442 
                               ->where("{$field}_max", '>=', $value[1]);
443 
-                    })->orWhere(function (Builder $query) use ($field, $value) {
443 
+                    })->orWhere(function(Builder $query) use ($field, $value) {
444 444 
                         $query->where("{$field}_min", '<=', $value[0])
445 445 
                               ->where("{$field}_max", '>=', $value[0]);
446 
-                    })->orWhere(function (Builder $query) use ($field, $value) {
446 
+                    })->orWhere(function(Builder $query) use ($field, $value) {
447 447 
                         $query->where("{$field}_min", '>=', $value[0])
448 448 
                               ->where("{$field}_max", '<=', $value[1]);
449 
-                    })->orWhere(function (Builder $query) use ($field, $value) {
449 
+                    })->orWhere(function(Builder $query) use ($field, $value) {
450 450 
                         $query->where("{$field}_min", '>=', $value[0])
451 451 
                               ->where("{$field}_max", '>=', $value[1])
452 452 
                               ->where("{$field}_min", '<=', $value[1]);
Please login to merge, or discard this patch.