@@ -43,17 +43,17 @@ |
||
| 43 | 43 | $query->where(function (Builder $query) use ($field, $value) { |
| 44 | 44 | $query->where(function (Builder $query) use ($field, $value) { |
| 45 | 45 | $query->where("{$field}_{$this->crossMin}", '<=', (int) $value[0]) |
| 46 | - ->where("{$field}_{$this->crossMax}", '>=', (int) $value[1]); |
|
| 46 | + ->where("{$field}_{$this->crossMax}", '>=', (int) $value[1]); |
|
| 47 | 47 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 48 | 48 | $query->where("{$field}_{$this->crossMin}", '<=', (int) $value[0]) |
| 49 | - ->where("{$field}_{$this->crossMax}", '>=', (int) $value[0]); |
|
| 49 | + ->where("{$field}_{$this->crossMax}", '>=', (int) $value[0]); |
|
| 50 | 50 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 51 | 51 | $query->where("{$field}_{$this->crossMin}", '>=', (int) $value[0]) |
| 52 | - ->where("{$field}_{$this->crossMax}", '<=', (int) $value[1]); |
|
| 52 | + ->where("{$field}_{$this->crossMax}", '<=', (int) $value[1]); |
|
| 53 | 53 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 54 | 54 | $query->where("{$field}_{$this->crossMin}", '>=', (int) $value[0]) |
| 55 | - ->where("{$field}_{$this->crossMax}", '>=', (int) $value[1]) |
|
| 56 | - ->where("{$field}_{$this->crossMin}", '<=', (int) $value[1]); |
|
| 55 | + ->where("{$field}_{$this->crossMax}", '>=', (int) $value[1]) |
|
| 56 | + ->where("{$field}_{$this->crossMin}", '<=', (int) $value[1]); |
|
| 57 | 57 | }); |
| 58 | 58 | }); |
| 59 | 59 | break; |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | |
| 32 | 32 | protected function parseSearchOrRelationClosure($value, $relation, $field, $condition) |
| 33 | 33 | { |
| 34 | - $this->model = $this->model->orWhereHas($relation, function (Builder $query) use ($field, $condition, $value) { |
|
| 34 | + $this->model = $this->model->orWhereHas($relation, function(Builder $query) use ($field, $condition, $value) { |
|
| 35 | 35 | switch ($condition) { |
| 36 | 36 | case 'in': |
| 37 | 37 | $query->whereIn($field, $value); |
@@ -40,17 +40,17 @@ discard block |
||
| 40 | 40 | $query->whereBetween($field, $value); |
| 41 | 41 | break; |
| 42 | 42 | case 'cross': |
| 43 | - $query->where(function (Builder $query) use ($field, $value) { |
|
| 44 | - $query->where(function (Builder $query) use ($field, $value) { |
|
| 43 | + $query->where(function(Builder $query) use ($field, $value) { |
|
| 44 | + $query->where(function(Builder $query) use ($field, $value) { |
|
| 45 | 45 | $query->where("{$field}_{$this->crossMin}", '<=', (int) $value[0]) |
| 46 | 46 | ->where("{$field}_{$this->crossMax}", '>=', (int) $value[1]); |
| 47 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 47 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 48 | 48 | $query->where("{$field}_{$this->crossMin}", '<=', (int) $value[0]) |
| 49 | 49 | ->where("{$field}_{$this->crossMax}", '>=', (int) $value[0]); |
| 50 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 50 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 51 | 51 | $query->where("{$field}_{$this->crossMin}", '>=', (int) $value[0]) |
| 52 | 52 | ->where("{$field}_{$this->crossMax}", '<=', (int) $value[1]); |
| 53 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 53 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 54 | 54 | $query->where("{$field}_{$this->crossMin}", '>=', (int) $value[0]) |
| 55 | 55 | ->where("{$field}_{$this->crossMax}", '>=', (int) $value[1]) |
| 56 | 56 | ->where("{$field}_{$this->crossMin}", '<=', (int) $value[1]); |
@@ -44,17 +44,17 @@ |
||
| 44 | 44 | $query->where(function (Builder $query) use ($field, $value) { |
| 45 | 45 | $query->where(function (Builder $query) use ($field, $value) { |
| 46 | 46 | $query->where("{$field}_{$this->crossMin}", '<=', (int) $value[0]) |
| 47 | - ->where("{$field}_{$this->crossMax}", '>=', (int) $value[1]); |
|
| 47 | + ->where("{$field}_{$this->crossMax}", '>=', (int) $value[1]); |
|
| 48 | 48 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 49 | 49 | $query->where("{$field}_{$this->crossMin}", '<=', (int) $value[0]) |
| 50 | - ->where("{$field}_{$this->crossMax}", '>=', (int) $value[0]); |
|
| 50 | + ->where("{$field}_{$this->crossMax}", '>=', (int) $value[0]); |
|
| 51 | 51 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 52 | 52 | $query->where("{$field}_{$this->crossMin}", '>=', (int) $value[0]) |
| 53 | - ->where("{$field}_{$this->crossMax}", '<=', (int) $value[1]); |
|
| 53 | + ->where("{$field}_{$this->crossMax}", '<=', (int) $value[1]); |
|
| 54 | 54 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 55 | 55 | $query->where("{$field}_{$this->crossMin}", '>=', (int) $value[0]) |
| 56 | - ->where("{$field}_{$this->crossMax}", '>=', (int) $value[1]) |
|
| 57 | - ->where("{$field}_{$this->crossMin}", '<=', (int) $value[1]); |
|
| 56 | + ->where("{$field}_{$this->crossMax}", '>=', (int) $value[1]) |
|
| 57 | + ->where("{$field}_{$this->crossMin}", '<=', (int) $value[1]); |
|
| 58 | 58 | }); |
| 59 | 59 | }); |
| 60 | 60 | break; |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | protected function parseSearchAndRelationClosure($value, $relation, $field, $condition) |
| 33 | 33 | { |
| 34 | 34 | $this->model = |
| 35 | - $this->model->whereHas($relation, function (Builder $query) use ($field, $condition, $value) { |
|
| 35 | + $this->model->whereHas($relation, function(Builder $query) use ($field, $condition, $value) { |
|
| 36 | 36 | switch ($condition) { |
| 37 | 37 | case 'in': |
| 38 | 38 | $query->whereIn($field, $value); |
@@ -41,17 +41,17 @@ discard block |
||
| 41 | 41 | $query->whereBetween($field, $value); |
| 42 | 42 | break; |
| 43 | 43 | case 'cross': |
| 44 | - $query->where(function (Builder $query) use ($field, $value) { |
|
| 45 | - $query->where(function (Builder $query) use ($field, $value) { |
|
| 44 | + $query->where(function(Builder $query) use ($field, $value) { |
|
| 45 | + $query->where(function(Builder $query) use ($field, $value) { |
|
| 46 | 46 | $query->where("{$field}_{$this->crossMin}", '<=', (int) $value[0]) |
| 47 | 47 | ->where("{$field}_{$this->crossMax}", '>=', (int) $value[1]); |
| 48 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 48 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 49 | 49 | $query->where("{$field}_{$this->crossMin}", '<=', (int) $value[0]) |
| 50 | 50 | ->where("{$field}_{$this->crossMax}", '>=', (int) $value[0]); |
| 51 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 51 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 52 | 52 | $query->where("{$field}_{$this->crossMin}", '>=', (int) $value[0]) |
| 53 | 53 | ->where("{$field}_{$this->crossMax}", '<=', (int) $value[1]); |
| 54 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 54 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 55 | 55 | $query->where("{$field}_{$this->crossMin}", '>=', (int) $value[0]) |
| 56 | 56 | ->where("{$field}_{$this->crossMax}", '>=', (int) $value[1]) |
| 57 | 57 | ->where("{$field}_{$this->crossMin}", '<=', (int) $value[1]); |
@@ -43,17 +43,17 @@ |
||
| 43 | 43 | $this->model = $this->model->orWhere(function (Builder $query) use ($field, $value) { |
| 44 | 44 | $query->where(function (Builder $query) use ($field, $value) { |
| 45 | 45 | $query->where("{$field}_{$this->crossMin}", '<=', (int) $value[0]) |
| 46 | - ->where("{$field}_{$this->crossMax}", '>=', (int) $value[1]); |
|
| 46 | + ->where("{$field}_{$this->crossMax}", '>=', (int) $value[1]); |
|
| 47 | 47 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 48 | 48 | $query->where("{$field}_{$this->crossMin}", '<=', (int) $value[0]) |
| 49 | - ->where("{$field}_{$this->crossMax}", '>=', (int) $value[0]); |
|
| 49 | + ->where("{$field}_{$this->crossMax}", '>=', (int) $value[0]); |
|
| 50 | 50 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 51 | 51 | $query->where("{$field}_{$this->crossMin}", '>=', (int) $value[0]) |
| 52 | - ->where("{$field}_{$this->crossMax}", '<=', (int) $value[1]); |
|
| 52 | + ->where("{$field}_{$this->crossMax}", '<=', (int) $value[1]); |
|
| 53 | 53 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 54 | 54 | $query->where("{$field}_{$this->crossMin}", '>=', (int) $value[0]) |
| 55 | - ->where("{$field}_{$this->crossMax}", '>=', (int) $value[1]) |
|
| 56 | - ->where("{$field}_{$this->crossMin}", '<=', (int) $value[1]); |
|
| 55 | + ->where("{$field}_{$this->crossMax}", '>=', (int) $value[1]) |
|
| 56 | + ->where("{$field}_{$this->crossMin}", '<=', (int) $value[1]); |
|
| 57 | 57 | }); |
| 58 | 58 | }); |
| 59 | 59 | break; |
@@ -40,17 +40,17 @@ |
||
| 40 | 40 | $this->model = $this->model->orWhereBetween($modelTableName.'.'.$field, $value); |
| 41 | 41 | break; |
| 42 | 42 | case 'cross': |
| 43 | - $this->model = $this->model->orWhere(function (Builder $query) use ($field, $value) { |
|
| 44 | - $query->where(function (Builder $query) use ($field, $value) { |
|
| 43 | + $this->model = $this->model->orWhere(function(Builder $query) use ($field, $value) { |
|
| 44 | + $query->where(function(Builder $query) use ($field, $value) { |
|
| 45 | 45 | $query->where("{$field}_{$this->crossMin}", '<=', (int) $value[0]) |
| 46 | 46 | ->where("{$field}_{$this->crossMax}", '>=', (int) $value[1]); |
| 47 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 47 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 48 | 48 | $query->where("{$field}_{$this->crossMin}", '<=', (int) $value[0]) |
| 49 | 49 | ->where("{$field}_{$this->crossMax}", '>=', (int) $value[0]); |
| 50 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 50 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 51 | 51 | $query->where("{$field}_{$this->crossMin}", '>=', (int) $value[0]) |
| 52 | 52 | ->where("{$field}_{$this->crossMax}", '<=', (int) $value[1]); |
| 53 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 53 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 54 | 54 | $query->where("{$field}_{$this->crossMin}", '>=', (int) $value[0]) |
| 55 | 55 | ->where("{$field}_{$this->crossMax}", '>=', (int) $value[1]) |
| 56 | 56 | ->where("{$field}_{$this->crossMin}", '<=', (int) $value[1]); |
@@ -42,17 +42,17 @@ |
||
| 42 | 42 | $this->model = $this->model->where(function (Builder $query) use ($field, $value) { |
| 43 | 43 | $query->where(function (Builder $query) use ($field, $value) { |
| 44 | 44 | $query->where("{$field}_{$this->crossMin}", '<=', (int) $value[0]) |
| 45 | - ->where("{$field}_{$this->crossMax}", '>=', (int) $value[1]); |
|
| 45 | + ->where("{$field}_{$this->crossMax}", '>=', (int) $value[1]); |
|
| 46 | 46 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 47 | 47 | $query->where("{$field}_{$this->crossMin}", '<=', (int) $value[0]) |
| 48 | - ->where("{$field}_{$this->crossMax}", '>=', (int) $value[0]); |
|
| 48 | + ->where("{$field}_{$this->crossMax}", '>=', (int) $value[0]); |
|
| 49 | 49 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 50 | 50 | $query->where("{$field}_{$this->crossMin}", '>=', (int) $value[0]) |
| 51 | - ->where("{$field}_{$this->crossMax}", '<=', (int) $value[1]); |
|
| 51 | + ->where("{$field}_{$this->crossMax}", '<=', (int) $value[1]); |
|
| 52 | 52 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 53 | 53 | $query->where("{$field}_{$this->crossMin}", '>=', (int) $value[0]) |
| 54 | - ->where("{$field}_{$this->crossMax}", '>=', (int) $value[1]) |
|
| 55 | - ->where("{$field}_{$this->crossMin}", '<=', (int) $value[1]); |
|
| 54 | + ->where("{$field}_{$this->crossMax}", '>=', (int) $value[1]) |
|
| 55 | + ->where("{$field}_{$this->crossMin}", '<=', (int) $value[1]); |
|
| 56 | 56 | }); |
| 57 | 57 | }); |
| 58 | 58 | break; |
@@ -39,17 +39,17 @@ |
||
| 39 | 39 | $this->model = $this->model->whereBetween($field, $value); |
| 40 | 40 | break; |
| 41 | 41 | case 'cross': |
| 42 | - $this->model = $this->model->where(function (Builder $query) use ($field, $value) { |
|
| 43 | - $query->where(function (Builder $query) use ($field, $value) { |
|
| 42 | + $this->model = $this->model->where(function(Builder $query) use ($field, $value) { |
|
| 43 | + $query->where(function(Builder $query) use ($field, $value) { |
|
| 44 | 44 | $query->where("{$field}_{$this->crossMin}", '<=', (int) $value[0]) |
| 45 | 45 | ->where("{$field}_{$this->crossMax}", '>=', (int) $value[1]); |
| 46 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 46 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 47 | 47 | $query->where("{$field}_{$this->crossMin}", '<=', (int) $value[0]) |
| 48 | 48 | ->where("{$field}_{$this->crossMax}", '>=', (int) $value[0]); |
| 49 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 49 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 50 | 50 | $query->where("{$field}_{$this->crossMin}", '>=', (int) $value[0]) |
| 51 | 51 | ->where("{$field}_{$this->crossMax}", '<=', (int) $value[1]); |
| 52 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 52 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 53 | 53 | $query->where("{$field}_{$this->crossMin}", '>=', (int) $value[0]) |
| 54 | 54 | ->where("{$field}_{$this->crossMax}", '>=', (int) $value[1]) |
| 55 | 55 | ->where("{$field}_{$this->crossMin}", '<=', (int) $value[1]); |