frowhy /
module-core
@@ -18,7 +18,7 @@ |
||
| 18 | 18 | { |
| 19 | 19 | $name = Module::find('core')->name; |
| 20 | 20 | $requirements = collect(Module::findRequirements('core')); |
| 21 | - $requirements = $requirements->map(function ($item) { |
|
| 21 | + $requirements = $requirements->map(function($item) { |
|
| 22 | 22 | return $item->name; |
| 23 | 23 | }); |
| 24 | 24 | $routes = get_routes('core'); |
@@ -19,7 +19,7 @@ |
||
| 19 | 19 | */ |
| 20 | 20 | public function handle($request, Closure $next, $guard) |
| 21 | 21 | { |
| 22 | - app()->singleton('tymon.jwt.auth', function () use ($guard) { |
|
| 22 | + app()->singleton('tymon.jwt.auth', function() use ($guard) { |
|
| 23 | 23 | return new JWTAuth(app('tymon.jwt.manager'), new Illuminate(auth($guard)), app('tymon.jwt.parser')); |
| 24 | 24 | }); |
| 25 | 25 | |
@@ -19,7 +19,7 @@ |
||
| 19 | 19 | */ |
| 20 | 20 | public function handle($request, Closure $next, $guard) |
| 21 | 21 | { |
| 22 | - app()->singleton('tymon.jwt.auth', function () use ($guard) { |
|
| 22 | + app()->singleton('tymon.jwt.auth', function() use ($guard) { |
|
| 23 | 23 | return new JWTAuth(app('tymon.jwt.manager'), new Illuminate(auth($guard)), app('tymon.jwt.parser')); |
| 24 | 24 | }); |
| 25 | 25 | |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | */ |
| 21 | 21 | public function handle($request, Closure $next, $guard) |
| 22 | 22 | { |
| 23 | - app()->singleton('tymon.jwt.auth', function () use ($guard) { |
|
| 23 | + app()->singleton('tymon.jwt.auth', function() use ($guard) { |
|
| 24 | 24 | return new JWTAuth(app('tymon.jwt.manager'), new Illuminate(auth($guard)), app('tymon.jwt.parser')); |
| 25 | 25 | }); |
| 26 | 26 | |
@@ -21,7 +21,7 @@ |
||
| 21 | 21 | */ |
| 22 | 22 | public function handle($request, Closure $next, $guard) |
| 23 | 23 | { |
| 24 | - app()->singleton('tymon.jwt.auth', function () use ($guard) { |
|
| 24 | + app()->singleton('tymon.jwt.auth', function() use ($guard) { |
|
| 25 | 25 | return new JWTAuth(app('tymon.jwt.manager'), new Illuminate(auth($guard)), app('tymon.jwt.parser')); |
| 26 | 26 | }); |
| 27 | 27 | |
@@ -8,6 +8,6 @@ |
||
| 8 | 8 | |
| 9 | 9 | use Illuminate\Console\Scheduling\Schedule; |
| 10 | 10 | |
| 11 | -return function (Schedule $schedule) { |
|
| 11 | +return function(Schedule $schedule) { |
|
| 12 | 12 | $schedule->command('telescope:prune')->daily(); |
| 13 | 13 | }; |
@@ -112,17 +112,17 @@ discard block |
||
| 112 | 112 | $query->where(function (Builder $query) use ($field, $value) { |
| 113 | 113 | $query->where(function (Builder $query) use ($field, $value) { |
| 114 | 114 | $query->where("{$field}_min", '<=', $value[0]) |
| 115 | - ->where("{$field}_max", '>=', $value[1]); |
|
| 115 | + ->where("{$field}_max", '>=', $value[1]); |
|
| 116 | 116 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 117 | 117 | $query->where("{$field}_min", '<=', $value[0]) |
| 118 | - ->where("{$field}_max", '>=', $value[0]); |
|
| 118 | + ->where("{$field}_max", '>=', $value[0]); |
|
| 119 | 119 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 120 | 120 | $query->where("{$field}_min", '>=', $value[0]) |
| 121 | - ->where("{$field}_max", '<=', $value[1]); |
|
| 121 | + ->where("{$field}_max", '<=', $value[1]); |
|
| 122 | 122 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 123 | 123 | $query->where("{$field}_min", '>=', $value[0]) |
| 124 | - ->where("{$field}_max", '>=', $value[1]) |
|
| 125 | - ->where("{$field}_min", '<=', $value[1]); |
|
| 124 | + ->where("{$field}_max", '>=', $value[1]) |
|
| 125 | + ->where("{$field}_min", '<=', $value[1]); |
|
| 126 | 126 | }); |
| 127 | 127 | }); |
| 128 | 128 | } else { |
@@ -138,17 +138,17 @@ discard block |
||
| 138 | 138 | $query->where(function (Builder $query) use ($field, $value) { |
| 139 | 139 | $query->where(function (Builder $query) use ($field, $value) { |
| 140 | 140 | $query->where("{$field}_min", '<=', $value[0]) |
| 141 | - ->where("{$field}_max", '>=', $value[1]); |
|
| 141 | + ->where("{$field}_max", '>=', $value[1]); |
|
| 142 | 142 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 143 | 143 | $query->where("{$field}_min", '<=', $value[0]) |
| 144 | - ->where("{$field}_max", '>=', $value[0]); |
|
| 144 | + ->where("{$field}_max", '>=', $value[0]); |
|
| 145 | 145 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 146 | 146 | $query->where("{$field}_min", '>=', $value[0]) |
| 147 | - ->where("{$field}_max", '<=', $value[1]); |
|
| 147 | + ->where("{$field}_max", '<=', $value[1]); |
|
| 148 | 148 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 149 | 149 | $query->where("{$field}_min", '>=', $value[0]) |
| 150 | - ->where("{$field}_max", '>=', $value[1]) |
|
| 151 | - ->where("{$field}_min", '<=', $value[1]); |
|
| 150 | + ->where("{$field}_max", '>=', $value[1]) |
|
| 151 | + ->where("{$field}_min", '<=', $value[1]); |
|
| 152 | 152 | }); |
| 153 | 153 | }); |
| 154 | 154 | } else { |
@@ -173,17 +173,17 @@ discard block |
||
| 173 | 173 | $query->where(function (Builder $query) use ($field, $value) { |
| 174 | 174 | $query->where(function (Builder $query) use ($field, $value) { |
| 175 | 175 | $query->where("{$field}_min", '<=', $value[0]) |
| 176 | - ->where("{$field}_max", '>=', $value[1]); |
|
| 176 | + ->where("{$field}_max", '>=', $value[1]); |
|
| 177 | 177 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 178 | 178 | $query->where("{$field}_min", '<=', $value[0]) |
| 179 | - ->where("{$field}_max", '>=', $value[0]); |
|
| 179 | + ->where("{$field}_max", '>=', $value[0]); |
|
| 180 | 180 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 181 | 181 | $query->where("{$field}_min", '>=', $value[0]) |
| 182 | - ->where("{$field}_max", '<=', $value[1]); |
|
| 182 | + ->where("{$field}_max", '<=', $value[1]); |
|
| 183 | 183 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 184 | 184 | $query->where("{$field}_min", '>=', $value[0]) |
| 185 | - ->where("{$field}_max", '>=', $value[1]) |
|
| 186 | - ->where("{$field}_min", '<=', $value[1]); |
|
| 185 | + ->where("{$field}_max", '>=', $value[1]) |
|
| 186 | + ->where("{$field}_min", '<=', $value[1]); |
|
| 187 | 187 | }); |
| 188 | 188 | }); |
| 189 | 189 | } else { |
@@ -199,17 +199,17 @@ discard block |
||
| 199 | 199 | $query->orWhere(function (Builder $query) use ($field, $value) { |
| 200 | 200 | $query->where(function (Builder $query) use ($field, $value) { |
| 201 | 201 | $query->where("{$field}_min", '<=', $value[0]) |
| 202 | - ->where("{$field}_max", '>=', $value[1]); |
|
| 202 | + ->where("{$field}_max", '>=', $value[1]); |
|
| 203 | 203 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 204 | 204 | $query->where("{$field}_min", '<=', $value[0]) |
| 205 | - ->where("{$field}_max", '>=', $value[0]); |
|
| 205 | + ->where("{$field}_max", '>=', $value[0]); |
|
| 206 | 206 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 207 | 207 | $query->where("{$field}_min", '>=', $value[0]) |
| 208 | - ->where("{$field}_max", '<=', $value[1]); |
|
| 208 | + ->where("{$field}_max", '<=', $value[1]); |
|
| 209 | 209 | })->orWhere(function (Builder $query) use ($field, $value) { |
| 210 | 210 | $query->where("{$field}_min", '>=', $value[0]) |
| 211 | - ->where("{$field}_max", '>=', $value[1]) |
|
| 212 | - ->where("{$field}_min", '<=', $value[1]); |
|
| 211 | + ->where("{$field}_max", '>=', $value[1]) |
|
| 212 | + ->where("{$field}_min", '<=', $value[1]); |
|
| 213 | 213 | }); |
| 214 | 214 | }); |
| 215 | 215 | } else { |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | $modelForceAndWhere = strtolower($searchJoin) === 'and'; |
| 50 | 50 | |
| 51 | 51 | $model = |
| 52 | - $model->where(function ($query) use ( |
|
| 52 | + $model->where(function($query) use ( |
|
| 53 | 53 | $fields, |
| 54 | 54 | $search, |
| 55 | 55 | $searchData, |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | if ($isFirstField || $modelForceAndWhere) { |
| 100 | 100 | if (!is_null($value)) { |
| 101 | 101 | if (!is_null($relation)) { |
| 102 | - $query->whereHas($relation, function (Builder $query) use ( |
|
| 102 | + $query->whereHas($relation, function(Builder $query) use ( |
|
| 103 | 103 | $field, |
| 104 | 104 | $condition, |
| 105 | 105 | $value |
@@ -109,17 +109,17 @@ discard block |
||
| 109 | 109 | } elseif ($condition == 'between') { |
| 110 | 110 | $query->whereBetween($field, $value); |
| 111 | 111 | } elseif ($condition == 'cross') { |
| 112 | - $query->where(function (Builder $query) use ($field, $value) { |
|
| 113 | - $query->where(function (Builder $query) use ($field, $value) { |
|
| 112 | + $query->where(function(Builder $query) use ($field, $value) { |
|
| 113 | + $query->where(function(Builder $query) use ($field, $value) { |
|
| 114 | 114 | $query->where("{$field}_min", '<=', $value[0]) |
| 115 | 115 | ->where("{$field}_max", '>=', $value[1]); |
| 116 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 116 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 117 | 117 | $query->where("{$field}_min", '<=', $value[0]) |
| 118 | 118 | ->where("{$field}_max", '>=', $value[0]); |
| 119 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 119 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 120 | 120 | $query->where("{$field}_min", '>=', $value[0]) |
| 121 | 121 | ->where("{$field}_max", '<=', $value[1]); |
| 122 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 122 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 123 | 123 | $query->where("{$field}_min", '>=', $value[0]) |
| 124 | 124 | ->where("{$field}_max", '>=', $value[1]) |
| 125 | 125 | ->where("{$field}_min", '<=', $value[1]); |
@@ -135,17 +135,17 @@ discard block |
||
| 135 | 135 | } elseif ($condition == 'between') { |
| 136 | 136 | $query->whereBetween($field, $value); |
| 137 | 137 | } elseif ($condition == 'cross') { |
| 138 | - $query->where(function (Builder $query) use ($field, $value) { |
|
| 139 | - $query->where(function (Builder $query) use ($field, $value) { |
|
| 138 | + $query->where(function(Builder $query) use ($field, $value) { |
|
| 139 | + $query->where(function(Builder $query) use ($field, $value) { |
|
| 140 | 140 | $query->where("{$field}_min", '<=', $value[0]) |
| 141 | 141 | ->where("{$field}_max", '>=', $value[1]); |
| 142 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 142 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 143 | 143 | $query->where("{$field}_min", '<=', $value[0]) |
| 144 | 144 | ->where("{$field}_max", '>=', $value[0]); |
| 145 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 145 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 146 | 146 | $query->where("{$field}_min", '>=', $value[0]) |
| 147 | 147 | ->where("{$field}_max", '<=', $value[1]); |
| 148 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 148 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 149 | 149 | $query->where("{$field}_min", '>=', $value[0]) |
| 150 | 150 | ->where("{$field}_max", '>=', $value[1]) |
| 151 | 151 | ->where("{$field}_min", '<=', $value[1]); |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | } else { |
| 161 | 161 | if (!is_null($value)) { |
| 162 | 162 | if (!is_null($relation)) { |
| 163 | - $query->orWhereHas($relation, function (Builder $query) use ( |
|
| 163 | + $query->orWhereHas($relation, function(Builder $query) use ( |
|
| 164 | 164 | $field, |
| 165 | 165 | $condition, |
| 166 | 166 | $value |
@@ -170,17 +170,17 @@ discard block |
||
| 170 | 170 | } elseif ($condition == 'between') { |
| 171 | 171 | $query->whereBetween($field, $value); |
| 172 | 172 | } elseif ($condition == 'cross') { |
| 173 | - $query->where(function (Builder $query) use ($field, $value) { |
|
| 174 | - $query->where(function (Builder $query) use ($field, $value) { |
|
| 173 | + $query->where(function(Builder $query) use ($field, $value) { |
|
| 174 | + $query->where(function(Builder $query) use ($field, $value) { |
|
| 175 | 175 | $query->where("{$field}_min", '<=', $value[0]) |
| 176 | 176 | ->where("{$field}_max", '>=', $value[1]); |
| 177 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 177 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 178 | 178 | $query->where("{$field}_min", '<=', $value[0]) |
| 179 | 179 | ->where("{$field}_max", '>=', $value[0]); |
| 180 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 180 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 181 | 181 | $query->where("{$field}_min", '>=', $value[0]) |
| 182 | 182 | ->where("{$field}_max", '<=', $value[1]); |
| 183 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 183 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 184 | 184 | $query->where("{$field}_min", '>=', $value[0]) |
| 185 | 185 | ->where("{$field}_max", '>=', $value[1]) |
| 186 | 186 | ->where("{$field}_min", '<=', $value[1]); |
@@ -196,17 +196,17 @@ discard block |
||
| 196 | 196 | } elseif ($condition == 'between') { |
| 197 | 197 | $query->orWhereBetween($modelTableName.'.'.$field, $value); |
| 198 | 198 | } elseif ($condition == 'cross') { |
| 199 | - $query->orWhere(function (Builder $query) use ($field, $value) { |
|
| 200 | - $query->where(function (Builder $query) use ($field, $value) { |
|
| 199 | + $query->orWhere(function(Builder $query) use ($field, $value) { |
|
| 200 | + $query->where(function(Builder $query) use ($field, $value) { |
|
| 201 | 201 | $query->where("{$field}_min", '<=', $value[0]) |
| 202 | 202 | ->where("{$field}_max", '>=', $value[1]); |
| 203 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 203 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 204 | 204 | $query->where("{$field}_min", '<=', $value[0]) |
| 205 | 205 | ->where("{$field}_max", '>=', $value[0]); |
| 206 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 206 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 207 | 207 | $query->where("{$field}_min", '>=', $value[0]) |
| 208 | 208 | ->where("{$field}_max", '<=', $value[1]); |
| 209 | - })->orWhere(function (Builder $query) use ($field, $value) { |
|
| 209 | + })->orWhere(function(Builder $query) use ($field, $value) { |
|
| 210 | 210 | $query->where("{$field}_min", '>=', $value[0]) |
| 211 | 211 | ->where("{$field}_max", '>=', $value[1]) |
| 212 | 212 | ->where("{$field}_min", '<=', $value[1]); |
@@ -579,12 +579,12 @@ |
||
| 579 | 579 | function get_routes($module = null): Collection |
| 580 | 580 | { |
| 581 | 581 | /** @var \Illuminate\Support\Collection $routes */ |
| 582 | - $routes = collect(Route::getRoutes()->getRoutesByName())->groupBy(function ($item, $key) { |
|
| 582 | + $routes = collect(Route::getRoutes()->getRoutesByName())->groupBy(function($item, $key) { |
|
| 583 | 583 | $keys = explode('.', $key); |
| 584 | 584 | |
| 585 | 585 | return $keys[0]; |
| 586 | - }, true)->map(function (Collection $item) { |
|
| 587 | - return $item->mapWithKeys(function ($item, $key) { |
|
| 586 | + }, true)->map(function(Collection $item) { |
|
| 587 | + return $item->mapWithKeys(function($item, $key) { |
|
| 588 | 588 | $keys = explode('.', $key); |
| 589 | 589 | $route = collect($item->action) |
| 590 | 590 | ->put('method', $item->methods[0]) |
@@ -63,7 +63,7 @@ |
||
| 63 | 63 | } elseif ($exception instanceof UserNotDefinedException) { |
| 64 | 64 | $response['meta'][self::ERROR_CODE] = JWTErrorCode::USER_NOT_DEFINED; |
| 65 | 65 | } else { |
| 66 | - $response['meta'][self::ERROR_CODE] = JWTErrorCode::DEFAULT;; |
|
| 66 | + $response['meta'][self::ERROR_CODE] = JWTErrorCode::DEFAULT; ; |
|
| 67 | 67 | } |
| 68 | 68 | $response['meta'][self::STATUS_CODE] = StatusCodeEnum::HTTP_UNAUTHORIZED; |
| 69 | 69 | $response['meta'][self::MESSAGE] = $exception->getMessage(); |
