@@ -154,26 +154,26 @@ discard block |
||
| 154 | 154 | { |
| 155 | 155 | switch ($condition) { |
| 156 | 156 | case 'in': |
| 157 | - return function (Builder $query) use ($modelTableName, $field, $value) { |
|
| 157 | + return function(Builder $query) use ($modelTableName, $field, $value) { |
|
| 158 | 158 | $query->whereIn($modelTableName.'.'.$field, $value); |
| 159 | 159 | }; |
| 160 | 160 | case 'between': |
| 161 | - return function (Builder $query) use ($modelTableName, $field, $value) { |
|
| 161 | + return function(Builder $query) use ($modelTableName, $field, $value) { |
|
| 162 | 162 | $query->whereBetween($modelTableName.'.'.$field, $value); |
| 163 | 163 | }; |
| 164 | 164 | case 'cross': |
| 165 | - return function (Builder $query) use ($modelTableName, $field, $value) { |
|
| 166 | - $query->where(function (Builder $query) use ($modelTableName, $field, $value) { |
|
| 167 | - $query->where(function (Builder $query) use ($modelTableName, $field, $value) { |
|
| 165 | + return function(Builder $query) use ($modelTableName, $field, $value) { |
|
| 166 | + $query->where(function(Builder $query) use ($modelTableName, $field, $value) { |
|
| 167 | + $query->where(function(Builder $query) use ($modelTableName, $field, $value) { |
|
| 168 | 168 | $query->where("{$modelTableName}.{$field}_min", '<=', $value[0]) |
| 169 | 169 | ->where("{$modelTableName}.{$field}_max", '>=', $value[1]); |
| 170 | - })->orWhere(function (Builder $query) use ($modelTableName, $field, $value) { |
|
| 170 | + })->orWhere(function(Builder $query) use ($modelTableName, $field, $value) { |
|
| 171 | 171 | $query->where("{$modelTableName}.{$field}_min", '<=', $value[0]) |
| 172 | 172 | ->where("{$modelTableName}.{$field}_max", '>=', $value[0]); |
| 173 | - })->orWhere(function (Builder $query) use ($modelTableName, $field, $value) { |
|
| 173 | + })->orWhere(function(Builder $query) use ($modelTableName, $field, $value) { |
|
| 174 | 174 | $query->where("{$modelTableName}.{$field}_min", '>=', $value[0]) |
| 175 | 175 | ->where("{$modelTableName}.{$field}_max", '<=', $value[1]); |
| 176 | - })->orWhere(function (Builder $query) use ($modelTableName, $field, $value) { |
|
| 176 | + })->orWhere(function(Builder $query) use ($modelTableName, $field, $value) { |
|
| 177 | 177 | $query->where("{$modelTableName}.{$field}_min", '>=', $value[0]) |
| 178 | 178 | ->where("{$modelTableName}.{$field}_max", '>=', $value[1]) |
| 179 | 179 | ->where("{$modelTableName}.{$field}_min", '<=', $value[1]); |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | }); |
| 182 | 182 | }; |
| 183 | 183 | default: |
| 184 | - return function (Builder $query) use ($modelTableName, $field, $condition, $value) { |
|
| 184 | + return function(Builder $query) use ($modelTableName, $field, $condition, $value) { |
|
| 185 | 185 | $query->orWhere($modelTableName.'.'.$field, $condition, $value); |
| 186 | 186 | }; |
| 187 | 187 | } |
@@ -191,26 +191,26 @@ discard block |
||
| 191 | 191 | { |
| 192 | 192 | switch ($condition) { |
| 193 | 193 | case 'in': |
| 194 | - return function (Builder $query) use ($field, $value) { |
|
| 194 | + return function(Builder $query) use ($field, $value) { |
|
| 195 | 195 | $query->whereIn($field, $value); |
| 196 | 196 | }; |
| 197 | 197 | case 'between': |
| 198 | - return function (Builder $query) use ($field, $value) { |
|
| 198 | + return function(Builder $query) use ($field, $value) { |
|
| 199 | 199 | $query->whereBetween($field, $value); |
| 200 | 200 | }; |
| 201 | 201 | case 'cross': |
| 202 | - return function (Builder $query) use ($field, $value) { |
|
| 203 | - $query->where(function (Builder $query) use ($field, $value) { |
|
| 204 | - $query->where(function (Builder $query) use ($field, $value) { |
|
| 202 | + return function(Builder $query) use ($field, $value) { |
|
| 203 | + $query->where(function(Builder $query) use ($field, $value) { |
|
| 204 | + $query->where(function(Builder $query) use ($field, $value) { |
|
| 205 | 205 | $query->where("{$field}_min", '<=', $value[0]) |
| 206 | 206 | ->where("{$field}_max", '>=', $value[1]); |
| 207 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 207 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 208 | 208 | $query->where("{$field}_min", '<=', $value[0]) |
| 209 | 209 | ->where("{$field}_max", '>=', $value[0]); |
| 210 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 210 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 211 | 211 | $query->where("{$field}_min", '>=', $value[0]) |
| 212 | 212 | ->where("{$field}_max", '<=', $value[1]); |
| 213 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 213 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 214 | 214 | $query->where("{$field}_min", '>=', $value[0]) |
| 215 | 215 | ->where("{$field}_max", '>=', $value[1]) |
| 216 | 216 | ->where("{$field}_min", '<=', $value[1]); |
@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | }); |
| 219 | 219 | }; |
| 220 | 220 | default: |
| 221 | - return function (Builder $query) use ($field, $condition, $value) { |
|
| 221 | + return function(Builder $query) use ($field, $condition, $value) { |
|
| 222 | 222 | $query->where($field, $condition, $value); |
| 223 | 223 | }; |
| 224 | 224 | } |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | |
| 227 | 227 | protected function getRelationQueryClosure($field, $condition, $value) |
| 228 | 228 | { |
| 229 | - return function (Builder $query) use ( |
|
| 229 | + return function(Builder $query) use ( |
|
| 230 | 230 | $field, |
| 231 | 231 | $condition, |
| 232 | 232 | $value |
@@ -360,7 +360,7 @@ discard block |
||
| 360 | 360 | $modelForceAndWhere = strtolower($searchJoin) === 'and'; |
| 361 | 361 | |
| 362 | 362 | $model = |
| 363 | - $model->where(function (Builder $query) use ( |
|
| 363 | + $model->where(function(Builder $query) use ( |
|
| 364 | 364 | $fields, |
| 365 | 365 | $search, |
| 366 | 366 | $searchData, |