@@ -84,7 +84,7 @@ |
||
| 84 | 84 | { |
| 85 | 85 | static::$branchOrder = array_flip(array_flatten($order)); |
| 86 | 86 | |
| 87 | - static::$branchOrder = array_map(function ($item) { |
|
| 87 | + static::$branchOrder = array_map(function($item) { |
|
| 88 | 88 | return ++$item; |
| 89 | 89 | }, static::$branchOrder); |
| 90 | 90 | } |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | */ |
| 22 | 22 | public function index() |
| 23 | 23 | { |
| 24 | - return Admin::content(function (Content $content) { |
|
| 24 | + return Admin::content(function(Content $content) { |
|
| 25 | 25 | $content->header(trans('admin::lang.administrator')); |
| 26 | 26 | $content->description(trans('admin::lang.list')); |
| 27 | 27 | $content->body($this->grid()->render()); |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | */ |
| 38 | 38 | public function edit($id) |
| 39 | 39 | { |
| 40 | - return Admin::content(function (Content $content) use ($id) { |
|
| 40 | + return Admin::content(function(Content $content) use ($id) { |
|
| 41 | 41 | $content->header(trans('admin::lang.administrator')); |
| 42 | 42 | $content->description(trans('admin::lang.edit')); |
| 43 | 43 | $content->body($this->form()->edit($id)); |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | */ |
| 52 | 52 | public function create() |
| 53 | 53 | { |
| 54 | - return Admin::content(function (Content $content) { |
|
| 54 | + return Admin::content(function(Content $content) { |
|
| 55 | 55 | $content->header(trans('admin::lang.administrator')); |
| 56 | 56 | $content->description(trans('admin::lang.create')); |
| 57 | 57 | $content->body($this->form()); |
@@ -65,13 +65,13 @@ discard block |
||
| 65 | 65 | */ |
| 66 | 66 | protected function grid() |
| 67 | 67 | { |
| 68 | - return Admin::grid(Administrator::class, function (Grid $grid) { |
|
| 68 | + return Admin::grid(Administrator::class, function(Grid $grid) { |
|
| 69 | 69 | $grid->id('ID')->sortable(); |
| 70 | 70 | $grid->username(trans('admin::lang.username')); |
| 71 | 71 | $grid->name(trans('admin::lang.name')); |
| 72 | 72 | |
| 73 | - $grid->roles(trans('admin::lang.roles'))->value(function ($roles) { |
|
| 74 | - $roles = array_map(function ($role) { |
|
| 73 | + $grid->roles(trans('admin::lang.roles'))->value(function($roles) { |
|
| 74 | + $roles = array_map(function($role) { |
|
| 75 | 75 | return "<span class='label label-success'>{$role['name']}</span>"; |
| 76 | 76 | }, $roles); |
| 77 | 77 | |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | $grid->created_at(trans('admin::lang.created_at')); |
| 82 | 82 | $grid->updated_at(trans('admin::lang.updated_at')); |
| 83 | 83 | |
| 84 | - $grid->rows(function ($row) { |
|
| 84 | + $grid->rows(function($row) { |
|
| 85 | 85 | if ($row->id == 1) { |
| 86 | 86 | $row->actions('edit'); |
| 87 | 87 | } |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | */ |
| 97 | 97 | public function form() |
| 98 | 98 | { |
| 99 | - return Admin::form(Administrator::class, function (Form $form) { |
|
| 99 | + return Admin::form(Administrator::class, function(Form $form) { |
|
| 100 | 100 | $form->display('id', 'ID'); |
| 101 | 101 | |
| 102 | 102 | $form->text('username', trans('admin::lang.username'))->rules('required'); |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | $form->display('created_at', trans('admin::lang.created_at')); |
| 109 | 109 | $form->display('updated_at', trans('admin::lang.updated_at')); |
| 110 | 110 | |
| 111 | - $form->saving(function (Form $form) { |
|
| 111 | + $form->saving(function(Form $form) { |
|
| 112 | 112 | if ($form->password && $form->model()->password != $form->password) { |
| 113 | 113 | $form->password = bcrypt($form->password); |
| 114 | 114 | } |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | */ |
| 22 | 22 | public function index() |
| 23 | 23 | { |
| 24 | - return Admin::content(function (Content $content) { |
|
| 24 | + return Admin::content(function(Content $content) { |
|
| 25 | 25 | $content->header(trans('admin::lang.roles')); |
| 26 | 26 | $content->description(trans('admin::lang.list')); |
| 27 | 27 | $content->body($this->grid()->render()); |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | */ |
| 38 | 38 | public function edit($id) |
| 39 | 39 | { |
| 40 | - return Admin::content(function (Content $content) use ($id) { |
|
| 40 | + return Admin::content(function(Content $content) use ($id) { |
|
| 41 | 41 | $content->header(trans('admin::lang.roles')); |
| 42 | 42 | $content->description(trans('admin::lang.edit')); |
| 43 | 43 | $content->body($this->form()->edit($id)); |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | */ |
| 52 | 52 | public function create() |
| 53 | 53 | { |
| 54 | - return Admin::content(function (Content $content) { |
|
| 54 | + return Admin::content(function(Content $content) { |
|
| 55 | 55 | $content->header(trans('admin::lang.roles')); |
| 56 | 56 | $content->description(trans('admin::lang.create')); |
| 57 | 57 | $content->body($this->form()); |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | */ |
| 66 | 66 | protected function grid() |
| 67 | 67 | { |
| 68 | - return Admin::grid(Role::class, function (Grid $grid) { |
|
| 68 | + return Admin::grid(Role::class, function(Grid $grid) { |
|
| 69 | 69 | $grid->id('ID')->sortable(); |
| 70 | 70 | $grid->slug(trans('admin::lang.slug')); |
| 71 | 71 | $grid->name(trans('admin::lang.name')); |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | $grid->created_at(trans('admin::lang.created_at')); |
| 74 | 74 | $grid->updated_at(trans('admin::lang.updated_at')); |
| 75 | 75 | |
| 76 | - $grid->rows(function ($row) { |
|
| 76 | + $grid->rows(function($row) { |
|
| 77 | 77 | if ($row->slug == 'administrator') { |
| 78 | 78 | $row->actions('edit'); |
| 79 | 79 | } |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | */ |
| 89 | 89 | public function form() |
| 90 | 90 | { |
| 91 | - return Admin::form(Role::class, function (Form $form) { |
|
| 91 | + return Admin::form(Role::class, function(Form $form) { |
|
| 92 | 92 | $form->display('id', 'ID'); |
| 93 | 93 | |
| 94 | 94 | $form->text('slug', trans('admin::lang.slug'))->rules('required'); |
@@ -231,9 +231,9 @@ discard block |
||
| 231 | 231 | $data = $this->model->with($this->getRelations()) |
| 232 | 232 | ->findOrFail($id)->toArray(); |
| 233 | 233 | |
| 234 | - $this->builder->fields()->filter(function ($field) { |
|
| 234 | + $this->builder->fields()->filter(function($field) { |
|
| 235 | 235 | return $field instanceof Field\File; |
| 236 | - })->each(function (File $file) use ($data) { |
|
| 236 | + })->each(function(File $file) use ($data) { |
|
| 237 | 237 | $file->setOriginal($data); |
| 238 | 238 | |
| 239 | 239 | $file->destroy(); |
@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | |
| 256 | 256 | $this->prepare($data, $this->saving); |
| 257 | 257 | |
| 258 | - DB::transaction(function () { |
|
| 258 | + DB::transaction(function() { |
|
| 259 | 259 | $inserts = $this->prepareInsert($this->updates); |
| 260 | 260 | |
| 261 | 261 | foreach ($inserts as $column => $value) { |
@@ -293,7 +293,7 @@ discard block |
||
| 293 | 293 | |
| 294 | 294 | $updates = array_except($this->inputs, array_keys($this->relations)); |
| 295 | 295 | |
| 296 | - $this->updates = array_filter($updates, function ($val) { |
|
| 296 | + $this->updates = array_filter($updates, function($val) { |
|
| 297 | 297 | return !is_null($val); |
| 298 | 298 | }); |
| 299 | 299 | } |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | |
| 391 | 391 | $this->prepare($data, $this->saving); |
| 392 | 392 | |
| 393 | - DB::transaction(function () { |
|
| 393 | + DB::transaction(function() { |
|
| 394 | 394 | $updates = $this->prepareUpdate($this->updates); |
| 395 | 395 | |
| 396 | 396 | foreach ($updates as $column => $value) { |
@@ -590,7 +590,7 @@ discard block |
||
| 590 | 590 | protected function getFieldByColumn($column) |
| 591 | 591 | { |
| 592 | 592 | return $this->builder->fields()->first( |
| 593 | - function ($index, Field $field) use ($column) { |
|
| 593 | + function($index, Field $field) use ($column) { |
|
| 594 | 594 | if (is_array($field->column())) { |
| 595 | 595 | return in_array($column, $field->column()); |
| 596 | 596 | } |
@@ -609,7 +609,7 @@ discard block |
||
| 609 | 609 | { |
| 610 | 610 | $values = $this->model->toArray(); |
| 611 | 611 | |
| 612 | - $this->builder->fields()->each(function (Field $field) use ($values) { |
|
| 612 | + $this->builder->fields()->each(function(Field $field) use ($values) { |
|
| 613 | 613 | $field->setOriginal($values); |
| 614 | 614 | }); |
| 615 | 615 | } |
@@ -629,7 +629,7 @@ discard block |
||
| 629 | 629 | |
| 630 | 630 | $data = $this->model->toArray(); |
| 631 | 631 | |
| 632 | - $this->builder->fields()->each(function (Field $field) use ($data) { |
|
| 632 | + $this->builder->fields()->each(function(Field $field) use ($data) { |
|
| 633 | 633 | $field->fill($data); |
| 634 | 634 | }); |
| 635 | 635 | } |
@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | * |
| 219 | 219 | * @param $id |
| 220 | 220 | * |
| 221 | - * @return mixed |
|
| 221 | + * @return boolean |
|
| 222 | 222 | */ |
| 223 | 223 | public function destroy($id) |
| 224 | 224 | { |
@@ -293,7 +293,7 @@ discard block |
||
| 293 | 293 | * Prepare input data for insert or update. |
| 294 | 294 | * |
| 295 | 295 | * @param array $data |
| 296 | - * @param callable $callback |
|
| 296 | + * @param Closure $callback |
|
| 297 | 297 | */ |
| 298 | 298 | protected function prepare($data = [], Closure $callback = null) |
| 299 | 299 | { |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | * |
| 391 | 391 | * @param int $id |
| 392 | 392 | * |
| 393 | - * @return $this|\Illuminate\Http\RedirectResponse |
|
| 393 | + * @return \Symfony\Component\HttpFoundation\Response |
|
| 394 | 394 | */ |
| 395 | 395 | public function update($id) |
| 396 | 396 | { |
@@ -459,7 +459,7 @@ discard block |
||
| 459 | 459 | * @param int $id |
| 460 | 460 | * @param array $input |
| 461 | 461 | * |
| 462 | - * @return array |
|
| 462 | + * @return boolean |
|
| 463 | 463 | */ |
| 464 | 464 | protected function handleOrderable($id, array $input = []) |
| 465 | 465 | { |
@@ -599,7 +599,7 @@ discard block |
||
| 599 | 599 | /** |
| 600 | 600 | * Set saving callback. |
| 601 | 601 | * |
| 602 | - * @param callable $callback |
|
| 602 | + * @param Closure $callback |
|
| 603 | 603 | * |
| 604 | 604 | * @return void |
| 605 | 605 | */ |
@@ -611,7 +611,7 @@ discard block |
||
| 611 | 611 | /** |
| 612 | 612 | * Set saved callback. |
| 613 | 613 | * |
| 614 | - * @param callable $callback |
|
| 614 | + * @param Closure $callback |
|
| 615 | 615 | * |
| 616 | 616 | * @return void |
| 617 | 617 | */ |
@@ -23,12 +23,12 @@ discard block |
||
| 23 | 23 | */ |
| 24 | 24 | public function index() |
| 25 | 25 | { |
| 26 | - return Admin::content(function (Content $content) { |
|
| 26 | + return Admin::content(function(Content $content) { |
|
| 27 | 27 | $content->header(trans('admin::lang.menu')); |
| 28 | 28 | $content->description(trans('admin::lang.list')); |
| 29 | 29 | |
| 30 | - $content->row(function (Row $row) { |
|
| 31 | - $row->column(5, function (Column $column) { |
|
| 30 | + $content->row(function(Row $row) { |
|
| 31 | + $row->column(5, function(Column $column) { |
|
| 32 | 32 | $column->append($this->callout()); |
| 33 | 33 | |
| 34 | 34 | $form = new \Encore\Admin\Widgets\Form(); |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | */ |
| 63 | 63 | public function edit($id) |
| 64 | 64 | { |
| 65 | - return Admin::content(function (Content $content) use ($id) { |
|
| 65 | + return Admin::content(function(Content $content) use ($id) { |
|
| 66 | 66 | $content->header(trans('admin::lang.menu')); |
| 67 | 67 | $content->description(trans('admin::lang.edit')); |
| 68 | 68 | |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | */ |
| 117 | 117 | public function form() |
| 118 | 118 | { |
| 119 | - return Admin::form(MenuModel::class, function (Form $form) { |
|
| 119 | + return Admin::form(MenuModel::class, function(Form $form) { |
|
| 120 | 120 | $form->display('id', 'ID'); |
| 121 | 121 | |
| 122 | 122 | $options = [0 => 'Root'] + MenuModel::buildSelectOptions(); |
@@ -74,7 +74,7 @@ |
||
| 74 | 74 | /** |
| 75 | 75 | * @param $id |
| 76 | 76 | * |
| 77 | - * @return $this|\Illuminate\Http\RedirectResponse |
|
| 77 | + * @return \Symfony\Component\HttpFoundation\Response |
|
| 78 | 78 | */ |
| 79 | 79 | public function update($id) |
| 80 | 80 | { |
@@ -12,7 +12,7 @@ discard block |
||
| 12 | 12 | * |
| 13 | 13 | * @param $permission |
| 14 | 14 | * |
| 15 | - * @return true |
|
| 15 | + * @return boolean|null |
|
| 16 | 16 | */ |
| 17 | 17 | public static function check($permission) |
| 18 | 18 | { |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | * |
| 31 | 31 | * @param $roles |
| 32 | 32 | * |
| 33 | - * @return true |
|
| 33 | + * @return boolean|null |
|
| 34 | 34 | */ |
| 35 | 35 | public static function allow($roles) |
| 36 | 36 | { |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | * |
| 49 | 49 | * @param $roles |
| 50 | 50 | * |
| 51 | - * @return true |
|
| 51 | + * @return boolean|null |
|
| 52 | 52 | */ |
| 53 | 53 | public static function deny($roles) |
| 54 | 54 | { |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | if (is_array($permission)) { |
| 24 | - collect($permission)->each(function ($permission) { |
|
| 24 | + collect($permission)->each(function($permission) { |
|
| 25 | 25 | call_user_func([Permission::class, 'check'], $permission); |
| 26 | 26 | }); |
| 27 | 27 | |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | */ |
| 75 | 75 | protected static function error() |
| 76 | 76 | { |
| 77 | - $content = Admin::content(function ($content) { |
|
| 77 | + $content = Admin::content(function($content) { |
|
| 78 | 78 | $content->body(view('admin::deny')); |
| 79 | 79 | }); |
| 80 | 80 | |
@@ -65,11 +65,11 @@ discard block |
||
| 65 | 65 | $attributes = $this->attributes; |
| 66 | 66 | $attributes['namespace'] = 'Encore\Admin\Controllers'; |
| 67 | 67 | |
| 68 | - $this->router->group($attributes, function ($router) { |
|
| 68 | + $this->router->group($attributes, function($router) { |
|
| 69 | 69 | |
| 70 | 70 | $attributes = ['middleware' => 'admin.permission:allow,administrator']; |
| 71 | 71 | |
| 72 | - $router->group($attributes, function ($router) { |
|
| 72 | + $router->group($attributes, function($router) { |
|
| 73 | 73 | $router->resources([ |
| 74 | 74 | 'auth/users' => 'UserController', |
| 75 | 75 | 'auth/roles' => 'RoleController', |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | */ |
| 93 | 93 | public function register() |
| 94 | 94 | { |
| 95 | - $this->router->group($this->attributes, function ($router) { |
|
| 95 | + $this->router->group($this->attributes, function($router) { |
|
| 96 | 96 | foreach ($this->routes as $method => $arguments) { |
| 97 | 97 | foreach ($arguments as $argument) { |
| 98 | 98 | call_user_func_array([$router, $method], $argument); |
@@ -117,7 +117,7 @@ |
||
| 117 | 117 | /** |
| 118 | 118 | * Add form attributes. |
| 119 | 119 | * |
| 120 | - * @param string|array $attr |
|
| 120 | + * @param string $attr |
|
| 121 | 121 | * @param string $value |
| 122 | 122 | * |
| 123 | 123 | * @return $this |
@@ -160,7 +160,7 @@ |
||
| 160 | 160 | * |
| 161 | 161 | * @return $this |
| 162 | 162 | */ |
| 163 | - protected function pushField(Field &$field) |
|
| 163 | + protected function pushField(Field & $field) |
|
| 164 | 164 | { |
| 165 | 165 | array_push($this->fields, $field); |
| 166 | 166 | |
@@ -105,7 +105,7 @@ |
||
| 105 | 105 | */ |
| 106 | 106 | protected function decodeUtf8HtmlEntities($html) |
| 107 | 107 | { |
| 108 | - return preg_replace_callback('/(&#[0-9]+;)/', function ($html) { |
|
| 108 | + return preg_replace_callback('/(&#[0-9]+;)/', function($html) { |
|
| 109 | 109 | return mb_convert_encoding($html[1], 'UTF-8', 'HTML-ENTITIES'); |
| 110 | 110 | }, $html); |
| 111 | 111 | } |