@@ -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 | }; |
@@ -131,26 +131,26 @@ discard block |
||
131 | 131 | { |
132 | 132 | switch ($condition) { |
133 | 133 | case 'in': |
134 | - return function (Builder $query) use ($modelTableName, $field, $value) { |
|
134 | + return function(Builder $query) use ($modelTableName, $field, $value) { |
|
135 | 135 | $query->whereIn($modelTableName.'.'.$field, $value); |
136 | 136 | }; |
137 | 137 | case 'between': |
138 | - return function (Builder $query) use ($modelTableName, $field, $value) { |
|
138 | + return function(Builder $query) use ($modelTableName, $field, $value) { |
|
139 | 139 | $query->whereBetween($modelTableName.'.'.$field, $value); |
140 | 140 | }; |
141 | 141 | case 'cross': |
142 | - return function (Builder $query) use ($modelTableName, $field, $value) { |
|
143 | - $query->where(function (Builder $query) use ($modelTableName, $field, $value) { |
|
144 | - $query->where(function (Builder $query) use ($modelTableName, $field, $value) { |
|
142 | + return function(Builder $query) use ($modelTableName, $field, $value) { |
|
143 | + $query->where(function(Builder $query) use ($modelTableName, $field, $value) { |
|
144 | + $query->where(function(Builder $query) use ($modelTableName, $field, $value) { |
|
145 | 145 | $query->where("{$modelTableName}.{$field}_min", '<=', $value[0]) |
146 | 146 | ->where("{$modelTableName}.{$field}_max", '>=', $value[1]); |
147 | - })->orWhere(function (Builder $query) use ($modelTableName, $field, $value) { |
|
147 | + })->orWhere(function(Builder $query) use ($modelTableName, $field, $value) { |
|
148 | 148 | $query->where("{$modelTableName}.{$field}_min", '<=', $value[0]) |
149 | 149 | ->where("{$modelTableName}.{$field}_max", '>=', $value[0]); |
150 | - })->orWhere(function (Builder $query) use ($modelTableName, $field, $value) { |
|
150 | + })->orWhere(function(Builder $query) use ($modelTableName, $field, $value) { |
|
151 | 151 | $query->where("{$modelTableName}.{$field}_min", '>=', $value[0]) |
152 | 152 | ->where("{$modelTableName}.{$field}_max", '<=', $value[1]); |
153 | - })->orWhere(function (Builder $query) use ($modelTableName, $field, $value) { |
|
153 | + })->orWhere(function(Builder $query) use ($modelTableName, $field, $value) { |
|
154 | 154 | $query->where("{$modelTableName}.{$field}_min", '>=', $value[0]) |
155 | 155 | ->where("{$modelTableName}.{$field}_max", '>=', $value[1]) |
156 | 156 | ->where("{$modelTableName}.{$field}_min", '<=', $value[1]); |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | }); |
159 | 159 | }; |
160 | 160 | default: |
161 | - return function (Builder $query) use ($modelTableName, $field, $condition, $value) { |
|
161 | + return function(Builder $query) use ($modelTableName, $field, $condition, $value) { |
|
162 | 162 | $query->orWhere($modelTableName.'.'.$field, $condition, $value); |
163 | 163 | }; |
164 | 164 | } |
@@ -168,26 +168,26 @@ discard block |
||
168 | 168 | { |
169 | 169 | switch ($condition) { |
170 | 170 | case 'in': |
171 | - return function (Builder $query) use ($field, $value) { |
|
171 | + return function(Builder $query) use ($field, $value) { |
|
172 | 172 | $query->whereIn($field, $value); |
173 | 173 | }; |
174 | 174 | case 'between': |
175 | - return function (Builder $query) use ($field, $value) { |
|
175 | + return function(Builder $query) use ($field, $value) { |
|
176 | 176 | $query->whereBetween($field, $value); |
177 | 177 | }; |
178 | 178 | case 'cross': |
179 | - return function (Builder $query) use ($field, $value) { |
|
180 | - $query->where(function (Builder $query) use ($field, $value) { |
|
181 | - $query->where(function (Builder $query) use ($field, $value) { |
|
179 | + return function(Builder $query) use ($field, $value) { |
|
180 | + $query->where(function(Builder $query) use ($field, $value) { |
|
181 | + $query->where(function(Builder $query) use ($field, $value) { |
|
182 | 182 | $query->where("{$field}_min", '<=', $value[0]) |
183 | 183 | ->where("{$field}_max", '>=', $value[1]); |
184 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
184 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
185 | 185 | $query->where("{$field}_min", '<=', $value[0]) |
186 | 186 | ->where("{$field}_max", '>=', $value[0]); |
187 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
187 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
188 | 188 | $query->where("{$field}_min", '>=', $value[0]) |
189 | 189 | ->where("{$field}_max", '<=', $value[1]); |
190 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
190 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
191 | 191 | $query->where("{$field}_min", '>=', $value[0]) |
192 | 192 | ->where("{$field}_max", '>=', $value[1]) |
193 | 193 | ->where("{$field}_min", '<=', $value[1]); |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | }); |
196 | 196 | }; |
197 | 197 | default: |
198 | - return function (Builder $query) use ($field, $condition, $value) { |
|
198 | + return function(Builder $query) use ($field, $condition, $value) { |
|
199 | 199 | $query->where($field, $condition, $value); |
200 | 200 | }; |
201 | 201 | } |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | |
204 | 204 | protected function getRelationQueryClosure($field, $condition, $value) |
205 | 205 | { |
206 | - return function (Builder $query) use ( |
|
206 | + return function(Builder $query) use ( |
|
207 | 207 | $field, |
208 | 208 | $condition, |
209 | 209 | $value |
@@ -305,7 +305,7 @@ discard block |
||
305 | 305 | $modelForceAndWhere = strtolower($searchJoin) === 'and'; |
306 | 306 | |
307 | 307 | $model = |
308 | - $model->where(function (Builder $query) use ( |
|
308 | + $model->where(function(Builder $query) use ( |
|
309 | 309 | $fields, |
310 | 310 | $search, |
311 | 311 | $searchData, |
@@ -424,7 +424,7 @@ discard block |
||
424 | 424 | |
425 | 425 | protected function searchQueryClosure(&$isFirstField, $modelForceAndWhere, $relation, $field, $condition, $value) |
426 | 426 | { |
427 | - return function (Builder $query) use ( |
|
427 | + return function(Builder $query) use ( |
|
428 | 428 | $isFirstField, |
429 | 429 | $modelForceAndWhere, |
430 | 430 | $relation, |
@@ -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(); |