@@ -22,7 +22,7 @@ |
||
22 | 22 | */ |
23 | 23 | public function handle($request, Closure $next, $guard) |
24 | 24 | { |
25 | - app()->singleton('tymon.jwt.auth', function () use ($guard) { |
|
25 | + app()->singleton('tymon.jwt.auth', function() use ($guard) { |
|
26 | 26 | /** @var GuardContract $auth */ |
27 | 27 | $auth = auth($guard); |
28 | 28 | return new JWTAuth(app('tymon.jwt.manager'), new Illuminate($auth), app('tymon.jwt.parser')); |
@@ -22,7 +22,7 @@ |
||
22 | 22 | */ |
23 | 23 | public function handle($request, Closure $next, $guard) |
24 | 24 | { |
25 | - app()->singleton('tymon.jwt.auth', function () use ($guard) { |
|
25 | + app()->singleton('tymon.jwt.auth', function() use ($guard) { |
|
26 | 26 | /** @var GuardContract $auth */ |
27 | 27 | $auth = auth($guard); |
28 | 28 | return new JWTAuth(app('tymon.jwt.manager'), new Illuminate($auth), app('tymon.jwt.parser')); |
@@ -312,17 +312,17 @@ discard block |
||
312 | 312 | $query->where(function (Builder $query) use ($modelTableName, $field, $value) { |
313 | 313 | $query->where(function (Builder $query) use ($modelTableName, $field, $value) { |
314 | 314 | $query->where("{$modelTableName}.{$field}_min", '<=', $value[0]) |
315 | - ->where("{$modelTableName}.{$field}_max", '>=', $value[1]); |
|
315 | + ->where("{$modelTableName}.{$field}_max", '>=', $value[1]); |
|
316 | 316 | })->orWhere(function (Builder $query) use ($modelTableName, $field, $value) { |
317 | 317 | $query->where("{$modelTableName}.{$field}_min", '<=', $value[0]) |
318 | - ->where("{$modelTableName}.{$field}_max", '>=', $value[0]); |
|
318 | + ->where("{$modelTableName}.{$field}_max", '>=', $value[0]); |
|
319 | 319 | })->orWhere(function (Builder $query) use ($modelTableName, $field, $value) { |
320 | 320 | $query->where("{$modelTableName}.{$field}_min", '>=', $value[0]) |
321 | - ->where("{$modelTableName}.{$field}_max", '<=', $value[1]); |
|
321 | + ->where("{$modelTableName}.{$field}_max", '<=', $value[1]); |
|
322 | 322 | })->orWhere(function (Builder $query) use ($modelTableName, $field, $value) { |
323 | 323 | $query->where("{$modelTableName}.{$field}_min", '>=', $value[0]) |
324 | - ->where("{$modelTableName}.{$field}_max", '>=', $value[1]) |
|
325 | - ->where("{$modelTableName}.{$field}_min", '<=', $value[1]); |
|
324 | + ->where("{$modelTableName}.{$field}_max", '>=', $value[1]) |
|
325 | + ->where("{$modelTableName}.{$field}_min", '<=', $value[1]); |
|
326 | 326 | }); |
327 | 327 | }); |
328 | 328 | }; |
@@ -349,17 +349,17 @@ discard block |
||
349 | 349 | $query->where(function (Builder $query) use ($field, $value) { |
350 | 350 | $query->where(function (Builder $query) use ($field, $value) { |
351 | 351 | $query->where("{$field}_min", '<=', $value[0]) |
352 | - ->where("{$field}_max", '>=', $value[1]); |
|
352 | + ->where("{$field}_max", '>=', $value[1]); |
|
353 | 353 | })->orWhere(function (Builder $query) use ($field, $value) { |
354 | 354 | $query->where("{$field}_min", '<=', $value[0]) |
355 | - ->where("{$field}_max", '>=', $value[0]); |
|
355 | + ->where("{$field}_max", '>=', $value[0]); |
|
356 | 356 | })->orWhere(function (Builder $query) use ($field, $value) { |
357 | 357 | $query->where("{$field}_min", '>=', $value[0]) |
358 | - ->where("{$field}_max", '<=', $value[1]); |
|
358 | + ->where("{$field}_max", '<=', $value[1]); |
|
359 | 359 | })->orWhere(function (Builder $query) use ($field, $value) { |
360 | 360 | $query->where("{$field}_min", '>=', $value[0]) |
361 | - ->where("{$field}_max", '>=', $value[1]) |
|
362 | - ->where("{$field}_min", '<=', $value[1]); |
|
361 | + ->where("{$field}_max", '>=', $value[1]) |
|
362 | + ->where("{$field}_min", '<=', $value[1]); |
|
363 | 363 | }); |
364 | 364 | }); |
365 | 365 | }; |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | $modelForceAndWhere = strtolower($searchJoin) === 'and'; |
65 | 65 | |
66 | 66 | $model = |
67 | - $model->where(function ($query) use ( |
|
67 | + $model->where(function($query) use ( |
|
68 | 68 | $fields, |
69 | 69 | $search, |
70 | 70 | $searchData, |
@@ -300,26 +300,26 @@ discard block |
||
300 | 300 | { |
301 | 301 | switch ($condition) { |
302 | 302 | case 'in': |
303 | - return function (Builder $query) use ($modelTableName, $field, $value) { |
|
303 | + return function(Builder $query) use ($modelTableName, $field, $value) { |
|
304 | 304 | $query->whereIn($modelTableName.'.'.$field, $value); |
305 | 305 | }; |
306 | 306 | case 'between': |
307 | - return function (Builder $query) use ($modelTableName, $field, $value) { |
|
307 | + return function(Builder $query) use ($modelTableName, $field, $value) { |
|
308 | 308 | $query->whereBetween($modelTableName.'.'.$field, $value); |
309 | 309 | }; |
310 | 310 | case 'cross': |
311 | - return function (Builder $query) use ($modelTableName, $field, $value) { |
|
312 | - $query->where(function (Builder $query) use ($modelTableName, $field, $value) { |
|
313 | - $query->where(function (Builder $query) use ($modelTableName, $field, $value) { |
|
311 | + return function(Builder $query) use ($modelTableName, $field, $value) { |
|
312 | + $query->where(function(Builder $query) use ($modelTableName, $field, $value) { |
|
313 | + $query->where(function(Builder $query) use ($modelTableName, $field, $value) { |
|
314 | 314 | $query->where("{$modelTableName}.{$field}_min", '<=', $value[0]) |
315 | 315 | ->where("{$modelTableName}.{$field}_max", '>=', $value[1]); |
316 | - })->orWhere(function (Builder $query) use ($modelTableName, $field, $value) { |
|
316 | + })->orWhere(function(Builder $query) use ($modelTableName, $field, $value) { |
|
317 | 317 | $query->where("{$modelTableName}.{$field}_min", '<=', $value[0]) |
318 | 318 | ->where("{$modelTableName}.{$field}_max", '>=', $value[0]); |
319 | - })->orWhere(function (Builder $query) use ($modelTableName, $field, $value) { |
|
319 | + })->orWhere(function(Builder $query) use ($modelTableName, $field, $value) { |
|
320 | 320 | $query->where("{$modelTableName}.{$field}_min", '>=', $value[0]) |
321 | 321 | ->where("{$modelTableName}.{$field}_max", '<=', $value[1]); |
322 | - })->orWhere(function (Builder $query) use ($modelTableName, $field, $value) { |
|
322 | + })->orWhere(function(Builder $query) use ($modelTableName, $field, $value) { |
|
323 | 323 | $query->where("{$modelTableName}.{$field}_min", '>=', $value[0]) |
324 | 324 | ->where("{$modelTableName}.{$field}_max", '>=', $value[1]) |
325 | 325 | ->where("{$modelTableName}.{$field}_min", '<=', $value[1]); |
@@ -327,7 +327,7 @@ discard block |
||
327 | 327 | }); |
328 | 328 | }; |
329 | 329 | default: |
330 | - return function (Builder $query) use ($modelTableName, $field, $condition, $value) { |
|
330 | + return function(Builder $query) use ($modelTableName, $field, $condition, $value) { |
|
331 | 331 | $query->orWhere($modelTableName.'.'.$field, $condition, $value); |
332 | 332 | }; |
333 | 333 | } |
@@ -337,26 +337,26 @@ discard block |
||
337 | 337 | { |
338 | 338 | switch ($condition) { |
339 | 339 | case 'in': |
340 | - return function (Builder $query) use ($field, $value) { |
|
340 | + return function(Builder $query) use ($field, $value) { |
|
341 | 341 | $query->whereIn($field, $value); |
342 | 342 | }; |
343 | 343 | case 'between': |
344 | - return function (Builder $query) use ($field, $value) { |
|
344 | + return function(Builder $query) use ($field, $value) { |
|
345 | 345 | $query->whereBetween($field, $value); |
346 | 346 | }; |
347 | 347 | case 'cross': |
348 | - return function (Builder $query) use ($field, $value) { |
|
349 | - $query->where(function (Builder $query) use ($field, $value) { |
|
350 | - $query->where(function (Builder $query) use ($field, $value) { |
|
348 | + return function(Builder $query) use ($field, $value) { |
|
349 | + $query->where(function(Builder $query) use ($field, $value) { |
|
350 | + $query->where(function(Builder $query) use ($field, $value) { |
|
351 | 351 | $query->where("{$field}_min", '<=', $value[0]) |
352 | 352 | ->where("{$field}_max", '>=', $value[1]); |
353 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
353 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
354 | 354 | $query->where("{$field}_min", '<=', $value[0]) |
355 | 355 | ->where("{$field}_max", '>=', $value[0]); |
356 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
356 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
357 | 357 | $query->where("{$field}_min", '>=', $value[0]) |
358 | 358 | ->where("{$field}_max", '<=', $value[1]); |
359 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
359 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
360 | 360 | $query->where("{$field}_min", '>=', $value[0]) |
361 | 361 | ->where("{$field}_max", '>=', $value[1]) |
362 | 362 | ->where("{$field}_min", '<=', $value[1]); |
@@ -364,7 +364,7 @@ discard block |
||
364 | 364 | }); |
365 | 365 | }; |
366 | 366 | default: |
367 | - return function (Builder $query) use ($field, $condition, $value) { |
|
367 | + return function(Builder $query) use ($field, $condition, $value) { |
|
368 | 368 | $query->where($field, $condition, $value); |
369 | 369 | }; |
370 | 370 | } |
@@ -372,7 +372,7 @@ discard block |
||
372 | 372 | |
373 | 373 | protected function getRelationQueryClosure($field, $condition, $value) |
374 | 374 | { |
375 | - return function (Builder $query) use ( |
|
375 | + return function(Builder $query) use ( |
|
376 | 376 | $field, |
377 | 377 | $condition, |
378 | 378 | $value |
@@ -77,7 +77,7 @@ |
||
77 | 77 | break; |
78 | 78 | |
79 | 79 | default: |
80 | - $response['meta'][self::ERROR_CODE] = JWTErrorCode::DEFAULT;; |
|
80 | + $response['meta'][self::ERROR_CODE] = JWTErrorCode::DEFAULT; ; |
|
81 | 81 | } |
82 | 82 | $response['meta'][self::STATUS_CODE] = StatusCodeEnum::HTTP_UNAUTHORIZED; |
83 | 83 | $response['meta'][self::MESSAGE] = $exception->getMessage(); |