@@ -61,7 +61,7 @@ |
||
61 | 61 | */ |
62 | 62 | public function render() |
63 | 63 | { |
64 | - $columns = $this->getGrid()->columns()->flatMap(function (Column $column) { |
|
64 | + $columns = $this->getGrid()->columns()->flatMap(function(Column $column) { |
|
65 | 65 | $name = $column->getName(); |
66 | 66 | |
67 | 67 | $total = ''; |
@@ -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'); |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | * Get or set option for grid. |
261 | 261 | * |
262 | 262 | * @param string $key |
263 | - * @param mixed $value |
|
263 | + * @param boolean $value |
|
264 | 264 | * |
265 | 265 | * @return $this|mixed |
266 | 266 | */ |
@@ -464,7 +464,7 @@ discard block |
||
464 | 464 | /** |
465 | 465 | * Get the grid paginator. |
466 | 466 | * |
467 | - * @return mixed |
|
467 | + * @return Tools\Paginator |
|
468 | 468 | */ |
469 | 469 | public function paginator() |
470 | 470 | { |
@@ -516,7 +516,7 @@ discard block |
||
516 | 516 | /** |
517 | 517 | * Set grid action callback. |
518 | 518 | * |
519 | - * @param Closure|string $actions |
|
519 | + * @param Closure $actions |
|
520 | 520 | * |
521 | 521 | * @return $this |
522 | 522 | */ |
@@ -876,8 +876,8 @@ discard block |
||
876 | 876 | /** |
877 | 877 | * Dynamically add columns to the grid view. |
878 | 878 | * |
879 | - * @param $method |
|
880 | - * @param $arguments |
|
879 | + * @param string $method |
|
880 | + * @param string[] $arguments |
|
881 | 881 | * |
882 | 882 | * @return Column |
883 | 883 | */ |
@@ -351,7 +351,7 @@ discard block |
||
351 | 351 | public function visibleColumns() |
352 | 352 | { |
353 | 353 | $querySelections = array_filter(explode(',', request(Tools\ColumnSelector::SELECT_COLUMN_NAME))); |
354 | - if ( count($querySelections) > 0) { |
|
354 | + if (count($querySelections) > 0) { |
|
355 | 355 | $visible = $querySelections; |
356 | 356 | } else { |
357 | 357 | $visible = $this->columnShownNames; |
@@ -363,7 +363,7 @@ discard block |
||
363 | 363 | |
364 | 364 | array_push($visible, '__row_selector__', '__actions__'); |
365 | 365 | |
366 | - return $this->columns->filter(function (Column $column) use ($visible) { |
|
366 | + return $this->columns->filter(function(Column $column) use ($visible) { |
|
367 | 367 | return in_array($column->getName(), $visible); |
368 | 368 | }); |
369 | 369 | } |
@@ -376,7 +376,7 @@ discard block |
||
376 | 376 | public function visibleColumnNames() |
377 | 377 | { |
378 | 378 | $querySelections = array_filter(explode(',', request(Tools\ColumnSelector::SELECT_COLUMN_NAME))); |
379 | - if ( count($querySelections) > 0) { |
|
379 | + if (count($querySelections) > 0) { |
|
380 | 380 | $visible = $querySelections; |
381 | 381 | } else { |
382 | 382 | $visible = $this->columnShownNames; |
@@ -388,7 +388,7 @@ discard block |
||
388 | 388 | |
389 | 389 | array_push($visible, '__row_selector__', '__actions__'); |
390 | 390 | |
391 | - return collect($this->columnNames)->filter(function ($column) use ($visible) { |
|
391 | + return collect($this->columnNames)->filter(function($column) use ($visible) { |
|
392 | 392 | return in_array($column, $visible); |
393 | 393 | }); |
394 | 394 | } |
@@ -406,7 +406,7 @@ discard block |
||
406 | 406 | $column = new Column($column, $label); |
407 | 407 | $column->setGrid($this); |
408 | 408 | |
409 | - return tap($column, function ($value) { |
|
409 | + return tap($column, function($value) { |
|
410 | 410 | $this->columns->push($value); |
411 | 411 | }); |
412 | 412 | } |
@@ -470,7 +470,7 @@ discard block |
||
470 | 470 | $column = new Column($column, $label); |
471 | 471 | $column->setGrid($this); |
472 | 472 | |
473 | - return tap($column, function ($value) { |
|
473 | + return tap($column, function($value) { |
|
474 | 474 | $this->columns->prepend($value); |
475 | 475 | }); |
476 | 476 | } |
@@ -633,7 +633,7 @@ discard block |
||
633 | 633 | |
634 | 634 | Column::setOriginalGridModels($collection); |
635 | 635 | |
636 | - $this->columns->map(function (Column $column) use (&$data) { |
|
636 | + $this->columns->map(function(Column $column) use (&$data) { |
|
637 | 637 | $data = $column->fill($data); |
638 | 638 | |
639 | 639 | $this->columnNames[] = $column->getName(); |
@@ -653,7 +653,7 @@ discard block |
||
653 | 653 | */ |
654 | 654 | protected function buildRows(array $data) |
655 | 655 | { |
656 | - $this->rows = collect($data)->map(function ($model, $number) { |
|
656 | + $this->rows = collect($data)->map(function($model, $number) { |
|
657 | 657 | return new Row($number, $model); |
658 | 658 | }); |
659 | 659 |
@@ -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')); |
@@ -26,10 +26,10 @@ discard block |
||
26 | 26 | return $content |
27 | 27 | ->title(trans('admin.menu')) |
28 | 28 | ->description(trans('admin.list')) |
29 | - ->row(function (Row $row) { |
|
29 | + ->row(function(Row $row) { |
|
30 | 30 | $row->column(6, $this->treeView()->render()); |
31 | 31 | |
32 | - $row->column(6, function (Column $column) { |
|
32 | + $row->column(6, function(Column $column) { |
|
33 | 33 | $form = new \Encore\Admin\Widgets\Form(); |
34 | 34 | $form->action(admin_base_path('auth/menu')); |
35 | 35 | |
@@ -71,10 +71,10 @@ discard block |
||
71 | 71 | { |
72 | 72 | $menuModel = config('admin.database.menu_model'); |
73 | 73 | |
74 | - return $menuModel::tree(function (Tree $tree) { |
|
74 | + return $menuModel::tree(function(Tree $tree) { |
|
75 | 75 | $tree->disableCreate(); |
76 | 76 | |
77 | - $tree->branch(function ($branch) { |
|
77 | + $tree->branch(function($branch) { |
|
78 | 78 | $payload = "<i class='fa {$branch['icon']}'></i> <strong>{$branch['title']}</strong>"; |
79 | 79 | |
80 | 80 | if (!isset($branch['children'])) { |
@@ -34,14 +34,14 @@ discard block |
||
34 | 34 | $grid->column('created_at', trans('admin.created_at')); |
35 | 35 | $grid->column('updated_at', trans('admin.updated_at')); |
36 | 36 | |
37 | - $grid->actions(function (Grid\Displayers\Actions $actions) { |
|
37 | + $grid->actions(function(Grid\Displayers\Actions $actions) { |
|
38 | 38 | if ($actions->getKey() == 1) { |
39 | 39 | $actions->disableDelete(); |
40 | 40 | } |
41 | 41 | }); |
42 | 42 | |
43 | - $grid->tools(function (Grid\Tools $tools) { |
|
44 | - $tools->batch(function (Grid\Tools\BatchActions $actions) { |
|
43 | + $grid->tools(function(Grid\Tools $tools) { |
|
44 | + $tools->batch(function(Grid\Tools\BatchActions $actions) { |
|
45 | 45 | $actions->disableDelete(); |
46 | 46 | }); |
47 | 47 | }); |
@@ -65,10 +65,10 @@ discard block |
||
65 | 65 | $show->field('id', 'ID'); |
66 | 66 | $show->field('username', trans('admin.username')); |
67 | 67 | $show->field('name', trans('admin.name')); |
68 | - $show->field('roles', trans('admin.roles'))->as(function ($roles) { |
|
68 | + $show->field('roles', trans('admin.roles'))->as(function($roles) { |
|
69 | 69 | return $roles->pluck('name'); |
70 | 70 | })->label(); |
71 | - $show->field('permissions', trans('admin.permissions'))->as(function ($permission) { |
|
71 | + $show->field('permissions', trans('admin.permissions'))->as(function($permission) { |
|
72 | 72 | return $permission->pluck('name'); |
73 | 73 | })->label(); |
74 | 74 | $show->field('created_at', trans('admin.created_at')); |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | $form->image('avatar', trans('admin.avatar')); |
102 | 102 | $form->password('password', trans('admin.password'))->rules('required|confirmed'); |
103 | 103 | $form->password('password_confirmation', trans('admin.password_confirmation'))->rules('required') |
104 | - ->default(function ($form) { |
|
104 | + ->default(function($form) { |
|
105 | 105 | return $form->model()->password; |
106 | 106 | }); |
107 | 107 | |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | $form->display('created_at', trans('admin.created_at')); |
114 | 114 | $form->display('updated_at', trans('admin.updated_at')); |
115 | 115 | |
116 | - $form->saving(function (Form $form) { |
|
116 | + $form->saving(function(Form $form) { |
|
117 | 117 | if ($form->password && $form->model()->password != $form->password) { |
118 | 118 | $form->password = bcrypt($form->password); |
119 | 119 | } |
@@ -10,7 +10,7 @@ |
||
10 | 10 | |
11 | 11 | public function render() |
12 | 12 | { |
13 | - $this->options = collect(DateTimeZone::listIdentifiers(DateTimeZone::ALL))->mapWithKeys(function ($timezone) { |
|
13 | + $this->options = collect(DateTimeZone::listIdentifiers(DateTimeZone::ALL))->mapWithKeys(function($timezone) { |
|
14 | 14 | return [$timezone => $timezone]; |
15 | 15 | })->toArray(); |
16 | 16 |
@@ -6,7 +6,7 @@ |
||
6 | 6 | { |
7 | 7 | public function display($size = 30) |
8 | 8 | { |
9 | - $src = sprintf('https://www.gravatar.com/avatar/%s?s=%d', md5(strtolower($this->value)), $size); |
|
9 | + $src = sprintf('https://www.gravatar.com/avatar/%s?s=%d', md5(strtolower($this->value)), $size); |
|
10 | 10 | |
11 | 11 | return "<img src='$src' class='img img-circle'/>"; |
12 | 12 | } |