@@ -65,7 +65,7 @@ |
||
65 | 65 | |
66 | 66 | $this->value = Arr::get($inputs, $this->column); |
67 | 67 | |
68 | - $value = array_filter($this->value, function ($val) { |
|
68 | + $value = array_filter($this->value, function($val) { |
|
69 | 69 | return $val !== ''; |
70 | 70 | }); |
71 | 71 |
@@ -279,7 +279,7 @@ discard block |
||
279 | 279 | */ |
280 | 280 | protected function removeFilterByID($id) |
281 | 281 | { |
282 | - $this->filters = array_filter($this->filters, function (AbstractFilter $filter) use ($id) { |
|
282 | + $this->filters = array_filter($this->filters, function(AbstractFilter $filter) use ($id) { |
|
283 | 283 | return $filter->getId() != $id; |
284 | 284 | }); |
285 | 285 | } |
@@ -293,7 +293,7 @@ discard block |
||
293 | 293 | { |
294 | 294 | $inputs = Arr::dot(Input::all()); |
295 | 295 | |
296 | - $inputs = array_filter($inputs, function ($input) { |
|
296 | + $inputs = array_filter($inputs, function($input) { |
|
297 | 297 | return $input !== '' && !is_null($input); |
298 | 298 | }); |
299 | 299 | |
@@ -321,7 +321,7 @@ discard block |
||
321 | 321 | } |
322 | 322 | } |
323 | 323 | |
324 | - return tap(array_filter($conditions), function ($conditions) { |
|
324 | + return tap(array_filter($conditions), function($conditions) { |
|
325 | 325 | if (!empty($conditions)) { |
326 | 326 | $this->expand(); |
327 | 327 | } |
@@ -339,9 +339,9 @@ discard block |
||
339 | 339 | return $inputs; |
340 | 340 | } |
341 | 341 | |
342 | - $inputs = collect($inputs)->filter(function ($input, $key) { |
|
342 | + $inputs = collect($inputs)->filter(function($input, $key) { |
|
343 | 343 | return Str::startsWith($key, "{$this->name}_"); |
344 | - })->mapWithKeys(function ($val, $key) { |
|
344 | + })->mapWithKeys(function($val, $key) { |
|
345 | 345 | $key = str_replace("{$this->name}_", '', $key); |
346 | 346 | |
347 | 347 | return [$key => $val]; |
@@ -411,7 +411,7 @@ discard block |
||
411 | 411 | */ |
412 | 412 | public function scope($key, $label = '') |
413 | 413 | { |
414 | - return tap(new Scope($key, $label), function (Scope $scope) { |
|
414 | + return tap(new Scope($key, $label), function(Scope $scope) { |
|
415 | 415 | return $this->scopes->push($scope); |
416 | 416 | }); |
417 | 417 | } |
@@ -435,7 +435,7 @@ discard block |
||
435 | 435 | { |
436 | 436 | $key = request(Scope::QUERY_NAME); |
437 | 437 | |
438 | - return $this->scopes->first(function ($scope) use ($key) { |
|
438 | + return $this->scopes->first(function($scope) use ($key) { |
|
439 | 439 | return $scope->key == $key; |
440 | 440 | }); |
441 | 441 | } |
@@ -555,9 +555,9 @@ discard block |
||
555 | 555 | |
556 | 556 | $columns->push($pageKey); |
557 | 557 | |
558 | - $groupNames = collect($this->filters)->filter(function ($filter) { |
|
558 | + $groupNames = collect($this->filters)->filter(function($filter) { |
|
559 | 559 | return $filter instanceof Group; |
560 | - })->map(function (AbstractFilter $filter) { |
|
560 | + })->map(function(AbstractFilter $filter) { |
|
561 | 561 | return "{$filter->getId()}_group"; |
562 | 562 | }); |
563 | 563 |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | { |
198 | 198 | static::$branchOrder = array_flip(Arr::flatten($order)); |
199 | 199 | |
200 | - static::$branchOrder = array_map(function ($item) { |
|
200 | + static::$branchOrder = array_map(function($item) { |
|
201 | 201 | return ++$item; |
202 | 202 | }, static::$branchOrder); |
203 | 203 | } |
@@ -294,7 +294,7 @@ discard block |
||
294 | 294 | { |
295 | 295 | parent::boot(); |
296 | 296 | |
297 | - static::saving(function (Model $branch) { |
|
297 | + static::saving(function(Model $branch) { |
|
298 | 298 | $parentColumn = $branch->getParentColumn(); |
299 | 299 | |
300 | 300 | if (Request::has($parentColumn) && Request::input($parentColumn) == $branch->getKey()) { |
@@ -21,20 +21,20 @@ |
||
21 | 21 | public static function environment() |
22 | 22 | { |
23 | 23 | $envs = [ |
24 | - ['name' => 'PHP version', 'value' => 'PHP/'.PHP_VERSION], |
|
25 | - ['name' => 'Laravel version', 'value' => app()->version()], |
|
26 | - ['name' => 'CGI', 'value' => php_sapi_name()], |
|
27 | - ['name' => 'Uname', 'value' => php_uname()], |
|
28 | - ['name' => 'Server', 'value' => Arr::get($_SERVER, 'SERVER_SOFTWARE')], |
|
24 | + ['name' => 'PHP version', 'value' => 'PHP/'.PHP_VERSION], |
|
25 | + ['name' => 'Laravel version', 'value' => app()->version()], |
|
26 | + ['name' => 'CGI', 'value' => php_sapi_name()], |
|
27 | + ['name' => 'Uname', 'value' => php_uname()], |
|
28 | + ['name' => 'Server', 'value' => Arr::get($_SERVER, 'SERVER_SOFTWARE')], |
|
29 | 29 | |
30 | - ['name' => 'Cache driver', 'value' => config('cache.default')], |
|
31 | - ['name' => 'Session driver', 'value' => config('session.driver')], |
|
32 | - ['name' => 'Queue driver', 'value' => config('queue.default')], |
|
30 | + ['name' => 'Cache driver', 'value' => config('cache.default')], |
|
31 | + ['name' => 'Session driver', 'value' => config('session.driver')], |
|
32 | + ['name' => 'Queue driver', 'value' => config('queue.default')], |
|
33 | 33 | |
34 | - ['name' => 'Timezone', 'value' => config('app.timezone')], |
|
35 | - ['name' => 'Locale', 'value' => config('app.locale')], |
|
36 | - ['name' => 'Env', 'value' => config('app.env')], |
|
37 | - ['name' => 'URL', 'value' => config('app.url')], |
|
34 | + ['name' => 'Timezone', 'value' => config('app.timezone')], |
|
35 | + ['name' => 'Locale', 'value' => config('app.locale')], |
|
36 | + ['name' => 'Env', 'value' => config('app.env')], |
|
37 | + ['name' => 'URL', 'value' => config('app.url')], |
|
38 | 38 | ]; |
39 | 39 | |
40 | 40 | return view('admin::dashboard.environment', compact('envs')); |
@@ -36,14 +36,14 @@ discard block |
||
36 | 36 | |
37 | 37 | $grid->id('ID')->sortable(); |
38 | 38 | $grid->user()->name('User'); |
39 | - $grid->method()->display(function ($method) { |
|
39 | + $grid->method()->display(function($method) { |
|
40 | 40 | $color = Arr::get(OperationLog::$methodColors, $method, 'grey'); |
41 | 41 | |
42 | 42 | return "<span class=\"badge bg-$color\">$method</span>"; |
43 | 43 | }); |
44 | 44 | $grid->path()->label('info'); |
45 | 45 | $grid->ip()->label('primary'); |
46 | - $grid->input()->display(function ($input) { |
|
46 | + $grid->input()->display(function($input) { |
|
47 | 47 | $input = json_decode($input, true); |
48 | 48 | $input = Arr::except($input, ['_pjax', '_token', '_method', '_previous_']); |
49 | 49 | if (empty($input)) { |
@@ -55,14 +55,14 @@ discard block |
||
55 | 55 | |
56 | 56 | $grid->created_at(trans('admin.created_at')); |
57 | 57 | |
58 | - $grid->actions(function (Grid\Displayers\Actions $actions) { |
|
58 | + $grid->actions(function(Grid\Displayers\Actions $actions) { |
|
59 | 59 | $actions->disableEdit(); |
60 | 60 | $actions->disableView(); |
61 | 61 | }); |
62 | 62 | |
63 | 63 | $grid->disableCreation(); |
64 | 64 | |
65 | - $grid->filter(function ($filter) { |
|
65 | + $grid->filter(function($filter) { |
|
66 | 66 | $userModel = config('admin.database.users_model'); |
67 | 67 | |
68 | 68 | $filter->equal('user_id', 'User')->select($userModel::all()->pluck('name', 'id')); |
@@ -65,9 +65,9 @@ |
||
65 | 65 | |
66 | 66 | $prepare = $form->prepare($input); |
67 | 67 | |
68 | - return collect($prepare)->reject(function ($item) { |
|
68 | + return collect($prepare)->reject(function($item) { |
|
69 | 69 | return $item[NestedForm::REMOVE_FLAG_NAME] == 1; |
70 | - })->map(function ($item) { |
|
70 | + })->map(function($item) { |
|
71 | 71 | unset($item[NestedForm::REMOVE_FLAG_NAME]); |
72 | 72 | |
73 | 73 | return $item; |
@@ -228,10 +228,10 @@ |
||
228 | 228 | 'middleware' => config('admin.route.middleware'), |
229 | 229 | ]; |
230 | 230 | |
231 | - app('router')->group($attributes, function ($router) { |
|
231 | + app('router')->group($attributes, function($router) { |
|
232 | 232 | |
233 | 233 | /* @var \Illuminate\Routing\Router $router */ |
234 | - $router->namespace('Encore\Admin\Controllers')->group(function ($router) { |
|
234 | + $router->namespace('Encore\Admin\Controllers')->group(function($router) { |
|
235 | 235 | |
236 | 236 | /* @var \Illuminate\Routing\Router $router */ |
237 | 237 | $router->resource('auth/users', 'UserController')->names('admin.auth.users'); |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | protected function minifyCSS() |
79 | 79 | { |
80 | 80 | $css = collect(array_merge(Admin::$css, Admin::baseCss())) |
81 | - ->unique()->map(function ($css) { |
|
81 | + ->unique()->map(function($css) { |
|
82 | 82 | |
83 | 83 | if (url()->isValidUrl($css)) { |
84 | 84 | $this->assets['css'][] = $css; |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | protected function minifyJS() |
103 | 103 | { |
104 | 104 | $js = collect(array_merge(Admin::$js, Admin::baseJs())) |
105 | - ->unique()->map(function ($js) { |
|
105 | + ->unique()->map(function($js) { |
|
106 | 106 | |
107 | 107 | if (url()->isValidUrl($js)) { |
108 | 108 | $this->assets['js'][] = $js; |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | |
126 | 126 | protected function generateManifest() |
127 | 127 | { |
128 | - $min = collect(Admin::$min)->mapWithKeys(function ($path, $type) { |
|
128 | + $min = collect(Admin::$min)->mapWithKeys(function($path, $type) { |
|
129 | 129 | return [$type => sprintf('%s?id=%s', $path, md5(uniqid()))]; |
130 | 130 | }); |
131 | 131 |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | */ |
22 | 22 | public function up() |
23 | 23 | { |
24 | - Schema::create(config('admin.database.users_table'), function (Blueprint $table) { |
|
24 | + Schema::create(config('admin.database.users_table'), function(Blueprint $table) { |
|
25 | 25 | $table->increments('id'); |
26 | 26 | $table->string('username', 190)->unique(); |
27 | 27 | $table->string('password', 60); |
@@ -31,14 +31,14 @@ discard block |
||
31 | 31 | $table->timestamps(); |
32 | 32 | }); |
33 | 33 | |
34 | - Schema::create(config('admin.database.roles_table'), function (Blueprint $table) { |
|
34 | + Schema::create(config('admin.database.roles_table'), function(Blueprint $table) { |
|
35 | 35 | $table->increments('id'); |
36 | 36 | $table->string('name', 50)->unique(); |
37 | 37 | $table->string('slug', 50)->unique(); |
38 | 38 | $table->timestamps(); |
39 | 39 | }); |
40 | 40 | |
41 | - Schema::create(config('admin.database.permissions_table'), function (Blueprint $table) { |
|
41 | + Schema::create(config('admin.database.permissions_table'), function(Blueprint $table) { |
|
42 | 42 | $table->increments('id'); |
43 | 43 | $table->string('name', 50)->unique(); |
44 | 44 | $table->string('slug', 50)->unique(); |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | $table->timestamps(); |
48 | 48 | }); |
49 | 49 | |
50 | - Schema::create(config('admin.database.menu_table'), function (Blueprint $table) { |
|
50 | + Schema::create(config('admin.database.menu_table'), function(Blueprint $table) { |
|
51 | 51 | $table->increments('id'); |
52 | 52 | $table->integer('parent_id')->default(0); |
53 | 53 | $table->integer('order')->default(0); |
@@ -59,35 +59,35 @@ discard block |
||
59 | 59 | $table->timestamps(); |
60 | 60 | }); |
61 | 61 | |
62 | - Schema::create(config('admin.database.role_users_table'), function (Blueprint $table) { |
|
62 | + Schema::create(config('admin.database.role_users_table'), function(Blueprint $table) { |
|
63 | 63 | $table->integer('role_id'); |
64 | 64 | $table->integer('user_id'); |
65 | 65 | $table->index(['role_id', 'user_id']); |
66 | 66 | $table->timestamps(); |
67 | 67 | }); |
68 | 68 | |
69 | - Schema::create(config('admin.database.role_permissions_table'), function (Blueprint $table) { |
|
69 | + Schema::create(config('admin.database.role_permissions_table'), function(Blueprint $table) { |
|
70 | 70 | $table->integer('role_id'); |
71 | 71 | $table->integer('permission_id'); |
72 | 72 | $table->index(['role_id', 'permission_id']); |
73 | 73 | $table->timestamps(); |
74 | 74 | }); |
75 | 75 | |
76 | - Schema::create(config('admin.database.user_permissions_table'), function (Blueprint $table) { |
|
76 | + Schema::create(config('admin.database.user_permissions_table'), function(Blueprint $table) { |
|
77 | 77 | $table->integer('user_id'); |
78 | 78 | $table->integer('permission_id'); |
79 | 79 | $table->index(['user_id', 'permission_id']); |
80 | 80 | $table->timestamps(); |
81 | 81 | }); |
82 | 82 | |
83 | - Schema::create(config('admin.database.role_menu_table'), function (Blueprint $table) { |
|
83 | + Schema::create(config('admin.database.role_menu_table'), function(Blueprint $table) { |
|
84 | 84 | $table->integer('role_id'); |
85 | 85 | $table->integer('menu_id'); |
86 | 86 | $table->index(['role_id', 'menu_id']); |
87 | 87 | $table->timestamps(); |
88 | 88 | }); |
89 | 89 | |
90 | - Schema::create(config('admin.database.operation_log_table'), function (Blueprint $table) { |
|
90 | + Schema::create(config('admin.database.operation_log_table'), function(Blueprint $table) { |
|
91 | 91 | $table->increments('id'); |
92 | 92 | $table->integer('user_id'); |
93 | 93 | $table->string('path'); |