@@ -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 | }; |
@@ -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, |
@@ -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(); |