@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | |
| 64 | 64 | protected function parseSearchAndRelationClosure($value, $relation, $field, $condition) |
| 65 | 65 | { |
| 66 | - $this->model = $this->model->whereHas($relation, function (Builder $query) use ($condition, $field, $value) { |
|
| 66 | + $this->model = $this->model->whereHas($relation, function(Builder $query) use ($condition, $field, $value) { |
|
| 67 | 67 | |
| 68 | 68 | if (is_array($this->searchClosures) && Arr::has($this->searchClosures, $condition)) { |
| 69 | 69 | $this->searchClosures[$condition]($query, $condition, $field, $value); |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | |
| 76 | 76 | protected function parseSearchAndClosure($value, $field, $condition) |
| 77 | 77 | { |
| 78 | - $this->model = $this->model->where(function (Builder $query) use ($condition, $field, $value) { |
|
| 78 | + $this->model = $this->model->where(function(Builder $query) use ($condition, $field, $value) { |
|
| 79 | 79 | |
| 80 | 80 | if (is_array($this->searchClosures) && Arr::has($this->searchClosures, $condition)) { |
| 81 | 81 | $this->searchClosures[$condition]($query, $condition, $field, $value); |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | |
| 88 | 88 | protected function parseSearchOrClosure($value, $field, $condition) |
| 89 | 89 | { |
| 90 | - $this->model = $this->model->orWhere(function (Builder $query) use ($condition, $field, $value) { |
|
| 90 | + $this->model = $this->model->orWhere(function(Builder $query) use ($condition, $field, $value) { |
|
| 91 | 91 | $modelTableName = $this->model->getModel()->getTable(); |
| 92 | 92 | |
| 93 | 93 | if (is_array($this->searchClosures) && Arr::has($this->searchClosures, $condition)) { |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | |
| 101 | 101 | protected function parseSearchOrRelationClosure($value, $relation, $field, $condition) |
| 102 | 102 | { |
| 103 | - $this->model = $this->model->orWhereHas($relation, function (Builder $query) use ($field, $condition, $value) { |
|
| 103 | + $this->model = $this->model->orWhereHas($relation, function(Builder $query) use ($field, $condition, $value) { |
|
| 104 | 104 | |
| 105 | 105 | if (is_array($this->searchClosures) && Arr::has($this->searchClosures, $condition)) { |
| 106 | 106 | $this->searchClosures[$condition]($query, $condition, $field, $value); |
@@ -98,17 +98,17 @@ |
||
| 98 | 98 | ) use ($crossMin, $crossMax) { |
| 99 | 99 | $query->where(function (Builder $query) use ($field, $value, $crossMin, $crossMax) { |
| 100 | 100 | $query->where("{$field}_{$crossMin}", '<=', (int) $value[0]) |
| 101 | - ->where("{$field}_{$crossMax}", '>=', (int) $value[1]); |
|
| 101 | + ->where("{$field}_{$crossMax}", '>=', (int) $value[1]); |
|
| 102 | 102 | })->orWhere(function (Builder $query) use ($field, $value, $crossMin, $crossMax) { |
| 103 | 103 | $query->where("{$field}_{$crossMin}", '<=', (int) $value[0]) |
| 104 | - ->where("{$field}_{$crossMax}", '>=', (int) $value[0]); |
|
| 104 | + ->where("{$field}_{$crossMax}", '>=', (int) $value[0]); |
|
| 105 | 105 | })->orWhere(function (Builder $query) use ($field, $value, $crossMin, $crossMax) { |
| 106 | 106 | $query->where("{$field}_{$crossMin}", '>=', (int) $value[0]) |
| 107 | - ->where("{$field}_{$crossMax}", '<=', (int) $value[1]); |
|
| 107 | + ->where("{$field}_{$crossMax}", '<=', (int) $value[1]); |
|
| 108 | 108 | })->orWhere(function (Builder $query) use ($field, $value, $crossMin, $crossMax) { |
| 109 | 109 | $query->where("{$field}_{$crossMin}", '>=', (int) $value[0]) |
| 110 | - ->where("{$field}_{$crossMax}", '>=', (int) $value[1]) |
|
| 111 | - ->where("{$field}_{$crossMin}", '<=', (int) $value[1]); |
|
| 110 | + ->where("{$field}_{$crossMax}", '>=', (int) $value[1]) |
|
| 111 | + ->where("{$field}_{$crossMin}", '<=', (int) $value[1]); |
|
| 112 | 112 | }); |
| 113 | 113 | }); |
| 114 | 114 | } |
@@ -89,23 +89,23 @@ discard block |
||
| 89 | 89 | $crossMin = config('repository.criteria.cross.min', 'min'); |
| 90 | 90 | $crossMax = config('repository.criteria.cross.min', 'max'); |
| 91 | 91 | |
| 92 | - $this->setSearchClosure('cross', function ( |
|
| 92 | + $this->setSearchClosure('cross', function( |
|
| 93 | 93 | Builder $query, |
| 94 | 94 | $condition, |
| 95 | 95 | $field, |
| 96 | 96 | $value, |
| 97 | 97 | $modelTableName = null |
| 98 | 98 | ) use ($crossMin, $crossMax) { |
| 99 | - $query->where(function (Builder $query) use ($field, $value, $crossMin, $crossMax) { |
|
| 99 | + $query->where(function(Builder $query) use ($field, $value, $crossMin, $crossMax) { |
|
| 100 | 100 | $query->where("{$field}_{$crossMin}", '<=', (int) $value[0]) |
| 101 | 101 | ->where("{$field}_{$crossMax}", '>=', (int) $value[1]); |
| 102 | - })->orWhere(function (Builder $query) use ($field, $value, $crossMin, $crossMax) { |
|
| 102 | + })->orWhere(function(Builder $query) use ($field, $value, $crossMin, $crossMax) { |
|
| 103 | 103 | $query->where("{$field}_{$crossMin}", '<=', (int) $value[0]) |
| 104 | 104 | ->where("{$field}_{$crossMax}", '>=', (int) $value[0]); |
| 105 | - })->orWhere(function (Builder $query) use ($field, $value, $crossMin, $crossMax) { |
|
| 105 | + })->orWhere(function(Builder $query) use ($field, $value, $crossMin, $crossMax) { |
|
| 106 | 106 | $query->where("{$field}_{$crossMin}", '>=', (int) $value[0]) |
| 107 | 107 | ->where("{$field}_{$crossMax}", '<=', (int) $value[1]); |
| 108 | - })->orWhere(function (Builder $query) use ($field, $value, $crossMin, $crossMax) { |
|
| 108 | + })->orWhere(function(Builder $query) use ($field, $value, $crossMin, $crossMax) { |
|
| 109 | 109 | $query->where("{$field}_{$crossMin}", '>=', (int) $value[0]) |
| 110 | 110 | ->where("{$field}_{$crossMax}", '>=', (int) $value[1]) |
| 111 | 111 | ->where("{$field}_{$crossMin}", '<=', (int) $value[1]); |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | |
| 116 | 116 | protected function setBetweenSearchClosure() |
| 117 | 117 | { |
| 118 | - $this->setSearchClosure('between', function ( |
|
| 118 | + $this->setSearchClosure('between', function( |
|
| 119 | 119 | Builder $query, |
| 120 | 120 | $condition, |
| 121 | 121 | $field, |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | |
| 129 | 129 | protected function setInSearchClosure() |
| 130 | 130 | { |
| 131 | - $this->setSearchClosure('in', function (Builder $query, $condition, $field, $value, $modelTableName = null) { |
|
| 131 | + $this->setSearchClosure('in', function(Builder $query, $condition, $field, $value, $modelTableName = null) { |
|
| 132 | 132 | $query->whereIn($field, $value); |
| 133 | 133 | }); |
| 134 | 134 | } |