@@ -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')); |
@@ -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; |
@@ -436,7 +436,7 @@ discard block |
||
436 | 436 | * |
437 | 437 | * @param array $data |
438 | 438 | * |
439 | - * @return mixed |
|
439 | + * @return Response|null |
|
440 | 440 | */ |
441 | 441 | protected function prepare($data = []) |
442 | 442 | { |
@@ -576,7 +576,7 @@ discard block |
||
576 | 576 | /** |
577 | 577 | * Get RedirectResponse after update. |
578 | 578 | * |
579 | - * @param mixed $key |
|
579 | + * @param integer $key |
|
580 | 580 | * |
581 | 581 | * @return \Illuminate\Http\RedirectResponse |
582 | 582 | */ |
@@ -376,7 +376,7 @@ discard block |
||
376 | 376 | return $ret; |
377 | 377 | } |
378 | 378 | |
379 | - collect(explode(',', $id))->filter()->each(function ($id) { |
|
379 | + collect(explode(',', $id))->filter()->each(function($id) { |
|
380 | 380 | $builder = $this->model()->newQuery(); |
381 | 381 | |
382 | 382 | if ($this->isSoftDeletes) { |
@@ -429,9 +429,9 @@ discard block |
||
429 | 429 | |
430 | 430 | $data = $model->toArray(); |
431 | 431 | |
432 | - $this->builder->fields()->filter(function ($field) { |
|
432 | + $this->builder->fields()->filter(function($field) { |
|
433 | 433 | return $field instanceof Field\File; |
434 | - })->each(function (Field\File $file) use ($data) { |
|
434 | + })->each(function(Field\File $file) use ($data) { |
|
435 | 435 | $file->setOriginal($data); |
436 | 436 | |
437 | 437 | $file->destroy(); |
@@ -456,7 +456,7 @@ discard block |
||
456 | 456 | return $response; |
457 | 457 | } |
458 | 458 | |
459 | - DB::transaction(function () { |
|
459 | + DB::transaction(function() { |
|
460 | 460 | $inserts = $this->prepareInsert($this->updates); |
461 | 461 | |
462 | 462 | foreach ($inserts as $column => $value) { |
@@ -626,7 +626,7 @@ discard block |
||
626 | 626 | return $response; |
627 | 627 | } |
628 | 628 | |
629 | - DB::transaction(function () { |
|
629 | + DB::transaction(function() { |
|
630 | 630 | $updates = $this->prepareUpdate($this->updates); |
631 | 631 | |
632 | 632 | foreach ($updates as $column => $value) { |
@@ -1106,7 +1106,7 @@ discard block |
||
1106 | 1106 | protected function getFieldByColumn($column) |
1107 | 1107 | { |
1108 | 1108 | return $this->builder->fields()->first( |
1109 | - function (Field $field) use ($column) { |
|
1109 | + function(Field $field) use ($column) { |
|
1110 | 1110 | if (is_array($field->column())) { |
1111 | 1111 | return in_array($column, $field->column()); |
1112 | 1112 | } |
@@ -1127,7 +1127,7 @@ discard block |
||
1127 | 1127 | |
1128 | 1128 | $values = $this->model->toArray(); |
1129 | 1129 | |
1130 | - $this->builder->fields()->each(function (Field $field) use ($values) { |
|
1130 | + $this->builder->fields()->each(function(Field $field) use ($values) { |
|
1131 | 1131 | $field->setOriginal($values); |
1132 | 1132 | }); |
1133 | 1133 | } |
@@ -1157,7 +1157,7 @@ discard block |
||
1157 | 1157 | |
1158 | 1158 | $data = $this->model->toArray(); |
1159 | 1159 | |
1160 | - $this->builder->fields()->each(function (Field $field) use ($data) { |
|
1160 | + $this->builder->fields()->each(function(Field $field) use ($data) { |
|
1161 | 1161 | if (!in_array($field->column(), $this->ignored, true)) { |
1162 | 1162 | $field->fill($data); |
1163 | 1163 | } |
@@ -1301,7 +1301,7 @@ discard block |
||
1301 | 1301 | */ |
1302 | 1302 | public function setWidth($fieldWidth = 8, $labelWidth = 2): self |
1303 | 1303 | { |
1304 | - $this->builder()->fields()->each(function ($field) use ($fieldWidth, $labelWidth) { |
|
1304 | + $this->builder()->fields()->each(function($field) use ($fieldWidth, $labelWidth) { |
|
1305 | 1305 | /* @var Field $field */ |
1306 | 1306 | $field->setWidth($fieldWidth, $labelWidth); |
1307 | 1307 | }); |
@@ -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 |
@@ -107,6 +107,7 @@ |
||
107 | 107 | } |
108 | 108 | |
109 | 109 | /** |
110 | + * @param string $name |
|
110 | 111 | * @return string |
111 | 112 | */ |
112 | 113 | protected function elementNameWithPrefix($name) |
@@ -287,10 +287,10 @@ |
||
287 | 287 | 'middleware' => config('admin.route.middleware'), |
288 | 288 | ]; |
289 | 289 | |
290 | - app('router')->group($attributes, function ($router) { |
|
290 | + app('router')->group($attributes, function($router) { |
|
291 | 291 | |
292 | 292 | /* @var \Illuminate\Support\Facades\Route $router */ |
293 | - $router->namespace('\Encore\Admin\Controllers')->group(function ($router) { |
|
293 | + $router->namespace('\Encore\Admin\Controllers')->group(function($router) { |
|
294 | 294 | |
295 | 295 | /* @var \Illuminate\Routing\Router $router */ |
296 | 296 | $router->resource('auth/users', 'UserController')->names('admin.auth.users'); |
@@ -36,14 +36,14 @@ discard block |
||
36 | 36 | $grid->column('created_at', trans('admin.created_at')); |
37 | 37 | $grid->column('updated_at', trans('admin.updated_at')); |
38 | 38 | |
39 | - $grid->actions(function (Grid\Displayers\Actions $actions) { |
|
39 | + $grid->actions(function(Grid\Displayers\Actions $actions) { |
|
40 | 40 | if ($actions->row->slug == 'administrator') { |
41 | 41 | $actions->disableDelete(); |
42 | 42 | } |
43 | 43 | }); |
44 | 44 | |
45 | - $grid->tools(function (Grid\Tools $tools) { |
|
46 | - $tools->batch(function (Grid\Tools\BatchActions $actions) { |
|
45 | + $grid->tools(function(Grid\Tools $tools) { |
|
46 | + $tools->batch(function(Grid\Tools\BatchActions $actions) { |
|
47 | 47 | $actions->disableDelete(); |
48 | 48 | }); |
49 | 49 | }); |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | $show->field('id', 'ID'); |
68 | 68 | $show->field('slug', trans('admin.slug')); |
69 | 69 | $show->field('name', trans('admin.name')); |
70 | - $show->field('permissions', trans('admin.permissions'))->as(function ($permission) { |
|
70 | + $show->field('permissions', trans('admin.permissions'))->as(function($permission) { |
|
71 | 71 | return $permission->pluck('name'); |
72 | 72 | })->label(); |
73 | 73 | $show->field('created_at', trans('admin.created_at')); |
@@ -27,14 +27,14 @@ discard block |
||
27 | 27 | |
28 | 28 | $grid->column('id', 'ID')->sortable(); |
29 | 29 | $grid->column('user.name', 'User'); |
30 | - $grid->column('method')->display(function ($method) { |
|
30 | + $grid->column('method')->display(function($method) { |
|
31 | 31 | $color = Arr::get(OperationLog::$methodColors, $method, 'grey'); |
32 | 32 | |
33 | 33 | return "<span class=\"badge bg-$color\">$method</span>"; |
34 | 34 | }); |
35 | 35 | $grid->column('path')->label('info'); |
36 | 36 | $grid->column('ip')->label('primary'); |
37 | - $grid->column('input')->display(function ($input) { |
|
37 | + $grid->column('input')->display(function($input) { |
|
38 | 38 | $input = json_decode($input, true); |
39 | 39 | $input = Arr::except($input, ['_pjax', '_token', '_method', '_previous_']); |
40 | 40 | if (empty($input)) { |
@@ -46,14 +46,14 @@ discard block |
||
46 | 46 | |
47 | 47 | $grid->column('created_at', trans('admin.created_at')); |
48 | 48 | |
49 | - $grid->actions(function (Grid\Displayers\Actions $actions) { |
|
49 | + $grid->actions(function(Grid\Displayers\Actions $actions) { |
|
50 | 50 | $actions->disableEdit(); |
51 | 51 | $actions->disableView(); |
52 | 52 | }); |
53 | 53 | |
54 | 54 | $grid->disableCreateButton(); |
55 | 55 | |
56 | - $grid->filter(function (Grid\Filter $filter) { |
|
56 | + $grid->filter(function(Grid\Filter $filter) { |
|
57 | 57 | $userModel = config('admin.database.users_model'); |
58 | 58 | |
59 | 59 | $filter->equal('user_id', 'User')->select($userModel::all()->pluck('name', 'id')); |